treewide: unzip buildInputs to nativeBuildInputs (#112302)
This commit is contained in:
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
|
||||
./fuel-dir.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
buildInputs = with xorg; [ git rlwrap curl pkg-config perl
|
||||
libX11 pango cairo gtk2 gdk-pixbuf gtkglext
|
||||
mesa libXmu libXt libICE libSM openssl unzip ];
|
||||
mesa libXmu libXt libICE libSM openssl ];
|
||||
|
||||
buildPhase = ''
|
||||
sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile
|
||||
|
||||
@@ -89,7 +89,7 @@ let
|
||||
makeMxCache = list:
|
||||
stdenv.mkDerivation {
|
||||
name = "mx-cache";
|
||||
buildInputs = [ unzip ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildCommand = with lib; ''
|
||||
mkdir $out
|
||||
${lib.concatMapStrings
|
||||
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
|
||||
@@ -12,8 +12,7 @@ in stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
buildInputs = [ unzip ] ;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
|
||||
@@ -15,7 +15,8 @@ let
|
||||
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip freetype ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ freetype ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
|
||||
@@ -18,7 +18,8 @@ let
|
||||
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip freetype ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ freetype ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
|
||||
@@ -15,7 +15,8 @@ let
|
||||
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip freetype ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ freetype ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
|
||||
Reference in New Issue
Block a user