From 54b7d5266b5dfea29d28a638f097a15cd2f8199b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 2 Oct 2020 10:37:22 -0400 Subject: [PATCH] cmake: Don't be target sensative pkg-config now has a target-sensative wrapper. We shouldn't rebuild CMake because that wrapper changes. The setup hook should also be a build time dep. Fix #99325 --- pkgs/development/tools/build-managers/cmake/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 559a4c191b6..411f1ff1758 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -44,15 +44,16 @@ 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 useNcurses ncurses ++ lib.optional useQt4 qt4 ++ lib.optional withQt5 qtbase; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin ps; preConfigure = ''