public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'obsidian/cmake-nativeBuildInputs' into cmake-optional-openssl

Browse Source
This commit is contained in:
John Ericson 2020-10-13 19:23:14 -04:00
commit 5235a1e1fc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -45,16 +45,17 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
buildInputs = depsBuildBuild = [ buildPackages.stdenv.cc ];
[ setupHook pkgconfig ]
nativeBuildInputs = [ setupHook pkgconfig ];
buildInputs = []
++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
++ lib.optional useOpenSSL openssl ++ lib.optional useOpenSSL openssl
++ lib.optional useNcurses ncurses ++ lib.optional useNcurses ncurses
++ lib.optional useQt4 qt4 ++ lib.optional useQt4 qt4
++ lib.optional withQt5 qtbase; ++ lib.optional withQt5 qtbase;
depsBuildBuild = [ buildPackages.stdenv.cc ];
propagatedBuildInputs = lib.optional stdenv.isDarwin ps; propagatedBuildInputs = lib.optional stdenv.isDarwin ps;
preConfigure = '' preConfigure = ''