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

2020-10-13 19:23:14 -04:00 · 2020-10-13 19:23:14 -04:00 · 5235a1e1fc
commit 5235a1e1fc
parent e6294cfb7e 54b7d5266b
1 changed files with 5 additions and 4 deletions
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@ -45,16 +45,17 @@ stdenv.mkDerivation rec {

  setupHook = ./setup-hook.sh;

-  buildInputs =
-    [ setupHook pkgconfig ]
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  nativeBuildInputs = [ setupHook pkgconfig ];
+
+  buildInputs = []
    ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
    ++ lib.optional useOpenSSL openssl
    ++ lib.optional useNcurses ncurses
    ++ lib.optional useQt4 qt4
    ++ lib.optional withQt5 qtbase;

-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-
  propagatedBuildInputs = lib.optional stdenv.isDarwin ps;

  preConfigure = ''