treewide: unzip buildInputs to nativeBuildInputs (#112302)
This commit is contained in:
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1rmw4jmxn2lqp124mapvnic0ma8ipyvisx2vj848mvad5g5w9x3z";
|
||||
};
|
||||
|
||||
buildInputs = [ foomatic-filters bc unzip ghostscript systemd vim ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ foomatic-filters bc ghostscript systemd vim ];
|
||||
|
||||
patches = [ ./no-hardcode-fw.diff ];
|
||||
|
||||
|
||||
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [ autoreconfHook unzip ];
|
||||
|
||||
buildInputs = [ unzip zlib SDL readline libGLU libGL libX11 ];
|
||||
buildInputs = [ zlib SDL readline libGLU libGL libX11 ];
|
||||
|
||||
configureFlags = [
|
||||
"--target=default"
|
||||
|
||||
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
|
||||
libGLU libGL
|
||||
libarchive
|
||||
libao
|
||||
unzip
|
||||
xdg-utils
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
@@ -37,6 +36,7 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
unzip
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
phases = "unpackPhase buildPhase";
|
||||
inherit src srcDir tagSuffix;
|
||||
name = "${name}-source-with-tags";
|
||||
buildInputs = [ unzip ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
# using separate tag directory so that you don't have to glob that much files when starting your editor
|
||||
# is this a good choice?
|
||||
buildPhase =
|
||||
|
||||
Reference in New Issue
Block a user