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

treewide: unzip buildInputs to nativeBuildInputs (#112302)

Browse Source
This commit is contained in:
Ben Siraphob
2021-02-20 21:01:53 +00:00
committed by GitHub
parent ce5052e931
commit 127733211e
183 changed files with 282 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/gdal/2.4.nix
View File

@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
};
buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
nativeBuildInputs = [ unzip ];
buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
++ (with pythonPackages; [ python numpy wrapPython ])
++ lib.optional stdenv.isDarwin libiconv

3
pkgs/development/libraries/gdal/default.nix
View File

@@ -19,10 +19,9 @@ stdenv.mkDerivation rec {
sourceRoot = "source/gdal";
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [ autoreconfHook pkg-config unzip ];
buildInputs = [
unzip
libjpeg
libtiff
libpng

3
pkgs/development/libraries/gdal/gdal-1_11.nix
View File

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl";
};
buildInputs = [ unzip libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ];
nativeBuildInputs = [ unzip ];
buildInputs = [ libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ];
patches = [
# This ensures that the python package is installed into gdal's prefix,