diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-13 18:16:22 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-13 18:17:26 +0200 |
| commit | 26f17ee091248b4ead62f78a969f94e1230f4588 (patch) | |
| tree | 014f8844210225e75bb5b2c590c28715dd208422 /pkgs/development/tools/build-managers/cmake | |
| parent | eb5c1616401ff78509ee707a060efe738f5378b1 (diff) | |
| download | nixlib-26f17ee091248b4ead62f78a969f94e1230f4588.tar nixlib-26f17ee091248b4ead62f78a969f94e1230f4588.tar.gz nixlib-26f17ee091248b4ead62f78a969f94e1230f4588.tar.bz2 nixlib-26f17ee091248b4ead62f78a969f94e1230f4588.tar.lz nixlib-26f17ee091248b4ead62f78a969f94e1230f4588.tar.xz nixlib-26f17ee091248b4ead62f78a969f94e1230f4588.tar.zst nixlib-26f17ee091248b4ead62f78a969f94e1230f4588.zip | |
cmake: Get rid of circular dependency
Also, don't install static libraries in jsoncpp.
Diffstat (limited to 'pkgs/development/tools/build-managers/cmake')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 72ecb10b0990..77863c4532d0 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, bzip2, curl, expat, jsoncpp, libarchive, xz, zlib +, bzip2, curl, expat, libarchive, xz, zlib , useNcurses ? false, ncurses, useQt4 ? false, qt4 , wantPS ? false, ps ? null }: @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 curl expat libarchive xz zlib ] - ++ optional (jsoncpp != null) jsoncpp ++ optional useNcurses ncurses ++ optional useQt4 qt4; @@ -53,8 +52,8 @@ stdenv.mkDerivation rec { "--docdir=/share/doc/${name}" "--mandir=/share/man" "--system-libs" + "--no-system-jsoncpp" ] - ++ optional (jsoncpp == null) "--no-system-jsoncpp" ++ optional useQt4 "--qt-gui"; setupHook = ./setup-hook.sh; |