summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-01-23 20:37:45 +0100
committerGitHub <noreply@github.com>2021-01-23 20:37:45 +0100
commit2dde18a1043b17a0b447c1c34859241a80ee501e (patch)
treed4bd17afb2dc8c4b541ac76110530ceef1e732e7
parentbb6c8a4af98833f7b066a900adb66f74bb857fee (diff)
parent50855dacc07ea960c558530d6c72fb85b6ef04db (diff)
Merge pull request #110589 from siraben/cmake-buildinputs
-rw-r--r--pkgs/development/interpreters/falcon/default.nix4
-rw-r--r--pkgs/development/libraries/hdf5-blosc/default.nix3
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index 541e7b6f3248..ecac643f1ea9 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ cmake pcre zlib sqlite ];
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [ pcre zlib sqlite ];
meta = with lib; {
description = "Programming language with macros and syntax at once";
diff --git a/pkgs/development/libraries/hdf5-blosc/default.nix b/pkgs/development/libraries/hdf5-blosc/default.nix
index 0879bb9ee9dd..985660ff9073 100644
--- a/pkgs/development/libraries/hdf5-blosc/default.nix
+++ b/pkgs/development/libraries/hdf5-blosc/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "plugin" ];
- buildInputs = [ c-blosc cmake hdf5 ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ c-blosc hdf5 ];
preConfigure = ''
substituteInPlace CMakeLists.txt --replace 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")'