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

Merge pull request #115228 from siraben/unzip-buildInputs

Browse Source 
treewide: unzip buildInputs to nativeBuildInputs (2)
This commit is contained in:
John Ericson
2021-03-06 13:30:43 -05:00
committed by GitHub
parent 6979a72840 4f0cdb68d7
commit f5a7d8bb41
24 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/openjdk/11.nix
View File

@@ -25,9 +25,9 @@ let
sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw";
};
nativeBuildInputs = [ pkg-config autoconf ];
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/12.nix
View File

@@ -22,9 +22,9 @@ let
sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
};
nativeBuildInputs = [ pkg-config autoconf ];
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11
] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/13.nix
View File

@@ -22,9 +22,9 @@ let
sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
};
nativeBuildInputs = [ pkg-config autoconf ];
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/14.nix
View File

@@ -22,9 +22,9 @@ let
sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
};
nativeBuildInputs = [ pkg-config autoconf ];
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/8.nix
View File

@@ -83,9 +83,9 @@ let
outputs = [ "out" "jre" ];
nativeBuildInputs = [ pkg-config lndir ];
nativeBuildInputs = [ pkg-config lndir unzip ];
buildInputs = [
cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsaLib
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig
] ++ lib.optionals (!headless && enableGnome2) [

4
pkgs/development/compilers/openjdk/default.nix
View File

@@ -22,9 +22,9 @@ let
sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
};
nativeBuildInputs = [ pkg-config autoconf ];
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [