Merge pull request #55730 from plapadoo/fcppt-3.0.0
fcppt: 2.9.0 -> 3.0.0
This commit is contained in:
commit
e48b3308b5
|
@ -1,20 +1,20 @@
|
||||||
{ stdenv, fetchFromGitHub, cmake, boost, brigand }:
|
{ stdenv, fetchFromGitHub, cmake, boost, brigand, catch2 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "fcppt-${version}";
|
name = "fcppt-${version}";
|
||||||
version = "2.9.0";
|
version = "3.0.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "freundlich";
|
owner = "freundlich";
|
||||||
repo = "fcppt";
|
repo = "fcppt";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0zyqgmi1shjbwin1lx428v7vbi6jnywb1d47dascdn89r5gz6klv";
|
sha256 = "0l78fjhy9nl3afrf0da9da4wzp1sx3kcyc2j6b71i60kvk44v4in";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
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;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
|
|
@ -2586,7 +2586,9 @@ in
|
||||||
|
|
||||||
fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
|
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 { };
|
fcrackzip = callPackage ../tools/security/fcrackzip { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue