diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/jsoncpp/1.6.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.7/default.nix | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/jsoncpp/1.6.nix b/pkgs/development/libraries/jsoncpp/1.6.nix index 69dfc217573..d8b85847975 100644 --- a/pkgs/development/libraries/jsoncpp/1.6.nix +++ b/pkgs/development/libraries/jsoncpp/1.6.nix @@ -11,7 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz"; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = + [ + # cmake can be built with the system jsoncpp, or its own bundled version. + # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so + # we make a bootstrapping build with the bundled version. + (cmake.override { jsoncpp = null; }) + python + ]; meta = { inherit version; diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index b2d59246bc2..30e8d5ffe1c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -70,8 +70,7 @@ let (with pkgs; { Boost = boost155; - cmake = cmake-3_2; - inherit epoxy; + inherit cmake epoxy; GIF = giflib; GLIB2 = glib; Gpgme = gpgme; |