treewide: unzip buildInputs to nativeBuildInputs (#112302)

This commit is contained in:
Ben Siraphob
2021-02-20 16:01:53 -05:00
committed by GitHub
parent ce5052e931
commit 127733211e
183 changed files with 282 additions and 261 deletions
@@ -16,8 +16,8 @@ in stdenv.mkDerivation rec {
sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ unzip xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
nativeBuildInputs = [ makeWrapper unzip ];
buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
(with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);
preConfigure = ''
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
# case that happens when the archive doesn't have a subdirectory.
setSourceRoot = "sourceRoot=`pwd`";
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
buildFlags = lib.optional stdenv.cc.isClang "CC=clang";
+2 -1
View File
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297";
};
unpackCmd = "unzip $src";
buildInputs = [ unzip file ];
nativeBuildInputs = [ unzip ];
buildInputs = [ file ];
dontBuild = true;
installPhase = ''
+1 -1
View File
@@ -15,7 +15,7 @@ let
stdenv.mkDerivation (a // {
inherit installPhase;
dontUnpack = true;
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
meta = a.meta // {
platforms = graylog.meta.platforms;
maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ];
+1 -2
View File
@@ -18,8 +18,7 @@ stdenv.mkDerivation {
sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58";
};
nativeBuildInputs = [ copyDesktopItems ];
buildInputs = [ unzip ];
nativeBuildInputs = [ copyDesktopItems unzip ];
inherit jre;
installPhase = ''
+2 -1
View File
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr";
};
buildInputs = [rpmextract ncurses5 unzip];
nativeBuildInputs = [ unzip ];
buildInputs = [rpmextract ncurses5];
libPath =
lib.makeLibraryPath
[ stdenv.cc.cc stdenv.cc.libc ncurses5 ];
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0jfyxjxsjx29xhs3fl0f574nyncmk9j5jp8zlgd401mcaznn9c7l";
};
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p "$out/bin"
+2 -1
View File
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs = [ unzip libogg libvorbis ];
nativeBuildInputs = [ unzip ];
buildInputs = [ libogg libvorbis ];
patchPhase = ''
chmod -v +x configure