Merge pull request #55730 from plapadoo/fcppt-3.0.0

fcppt: 2.9.0 -> 3.0.0
This commit is contained in:
Ryan Mulligan 2019-02-17 07:00:02 -08:00 committed by GitHub
commit e48b3308b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions

View file

@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, cmake, boost, brigand }:
{ stdenv, fetchFromGitHub, cmake, boost, brigand, catch2 }:
stdenv.mkDerivation rec {
name = "fcppt-${version}";
version = "2.9.0";
version = "3.0.0";
src = fetchFromGitHub {
owner = "freundlich";
repo = "fcppt";
rev = version;
sha256 = "0zyqgmi1shjbwin1lx428v7vbi6jnywb1d47dascdn89r5gz6klv";
sha256 = "0l78fjhy9nl3afrf0da9da4wzp1sx3kcyc2j6b71i60kvk44v4in";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ];
buildInputs = [ boost catch2 ];
cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" "-DBrigand_INCLUDE_DIR=${brigand}/include" ];
cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" "-DBrigand_INCLUDE_DIR=${brigand}/include" ];
enableParallelBuilding = true;

View file

@ -2586,7 +2586,9 @@ in
fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
fcppt = callPackage ../development/libraries/fcppt { };
fcppt = callPackage ../development/libraries/fcppt {
stdenv = gcc8Stdenv;
};
fcrackzip = callPackage ../tools/security/fcrackzip { };