diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-20 21:01:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-20 16:01:53 -0500 |
| commit | 127733211e03cb0763246a2ebc0c99e2a438a6ce (patch) | |
| tree | aa9601b7da78a16d08e713e4d5e01ffe39dfd8b2 /pkgs/misc | |
| parent | ce5052e93174070b3648e02bd3c787668331e9b5 (diff) | |
treewide: unzip buildInputs to nativeBuildInputs (#112302)
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/drivers/foo2zjs/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/emulators/atari800/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/emulators/nestopia/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/source-and-tags/default.nix | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index deea3bd25f50e..e25deb4c77954 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -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 ]; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 163b81922c2bd..53f1009cfad51 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -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" diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index d1b18f12a8449..70e5d94def6f8 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -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 = '' diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index c82b96b82f953..966a451c060c4 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -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 = |