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

Merge pull request #110589 from siraben/cmake-buildinputs

Browse Source
This commit is contained in:
Sandro 2021-01-23 20:37:45 +01:00 committed by GitHub
commit 2dde18a104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/falcon/default.nix
View File

@ -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";

3
pkgs/development/libraries/hdf5-blosc/default.nix
View File

@ -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}")'