treewide: remove unzip where not needed

This commit is contained in:
Ben Siraphob 2021-05-11 20:07:47 +07:00 committed by Jonathan Ringer
parent 75c67d6be9
commit c5a669d3f7
18 changed files with 25 additions and 41 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python2Packages, makeWrapper, unzip
{ lib, stdenv, fetchurl, python2Packages, makeWrapper
, guiSupport ? false, tk ? null
, ApplicationServices
, mercurialSrc ? fetchurl rec {
@ -21,7 +21,7 @@ in python2Packages.buildPythonApplication {
inherit python; # pass it so that the same version can be used in hg2git
nativeBuildInputs = [ makeWrapper unzip ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ docutils ]
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
{ lib, stdenv, fetchurl, libjpeg, libtiff, zlib
, postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
, libiconv, libxml2
@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
};
nativeBuildInputs = [ unzip ];
buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
++ (with python2Packages; [ python numpy wrapPython ])

View file

@ -1,10 +1,10 @@
{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
{ lib, mkDerivation, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
mkDerivation rec {
version = "unstable-20-06-26";
pname = "herqq";
nativeBuildInputs = [ qmake unzip ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtmultimedia ];
outputs = [ "out" "dev" ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }:
let
common = import ./common.nix { inherit fetchzip; };
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib
'';
nativeBuildInputs = [ unzip ];
buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ];
meta = {

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
let
common = import ./common.nix { inherit fetchzip; };
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"-DIRRLICHT_BUILD_TOOLS=OFF"
];
nativeBuildInputs = [ cmake unzip ];
nativeBuildInputs = [ cmake ];
buildInputs = [ OpenGL Cocoa IOKit ];
meta = {

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid,
{ lib, stdenv, fetchFromGitHub, libX11, cmake, ois, freetype, libuuid,
boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } :
let
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
};
nativeBuildInputs = [ cmake pkg-config unzip ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libX11 ois freetype libuuid boost ]
++ (if withOgre then [ ogre ] else [ libGL libGLU ]);

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
{ lib, stdenv, fetchFromGitHub, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
stdenv.mkDerivation {
pname = "openexrid-unstable";
@ -25,7 +25,6 @@ stdenv.mkDerivation {
-I${openfx.dev}/include/OpenFX
'';
nativeBuildInputs = [ unzip ];
buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ];
enableParallelBuilding = true;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, unzip }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "openfx";
@ -11,8 +11,6 @@ stdenv.mkDerivation {
sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548";
};
nativeBuildInputs = [ unzip ];
outputs = [ "dev" "out" ];
enableParallelBuilding = true;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
{ lib, stdenv, fetchFromGitHub, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
stdenv.mkDerivation rec
{
@ -14,7 +14,6 @@ stdenv.mkDerivation rec
outputs = [ "out" ];
nativeBuildInputs = [ unzip ];
buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];
setSourceRoot = ''

View file

@ -1,5 +1,4 @@
{ lib, buildPythonPackage, fetchPypi
, unzip }:
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "python-simple-hipchat";
@ -10,8 +9,6 @@ buildPythonPackage rec {
sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav";
};
nativeBuildInputs = [ unzip ];
meta = with lib; {
description = "Easy peasy wrapper for HipChat's v1 API";
homepage = "https://github.com/kurttheviking/simple-hipchat-py";

View file

@ -1,4 +1,4 @@
{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, unzip, zip }:
{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, zip }:
stdenv.mkDerivation rec {
name = "jscoverage-0.5.1";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
./jsfalse_to_null.patch
];
nativeBuildInputs = [ unzip perl python3 zip ];
nativeBuildInputs = [ perl python3 zip ];
strictDeps = true;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim, time }:
{ lib, stdenv, fetchurl, foomatic-filters, bc, ghostscript, systemd, vim, time }:
stdenv.mkDerivation rec {
pname = "foo2zjs";
@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x";
};
nativeBuildInputs = [ unzip ];
buildInputs = [ foomatic-filters bc ghostscript systemd vim ];
patches = [ ./no-hardcode-fw.diff ];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook
, unzip, zlib, SDL, readline, libGLU, libGL, libX11 }:
, zlib, SDL, readline, libGLU, libGL, libX11 }:
with lib;
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy";
};
nativeBuildInputs = [ autoreconfHook unzip ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zlib SDL readline libGLU libGL libX11 ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, unzip, jdk }:
{ lib, stdenv, fetchurl, jdk }:
stdenv.mkDerivation {
name = "jboss-as-7.1.1.Final";
@ -7,8 +7,6 @@ stdenv.mkDerivation {
sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8";
};
nativeBuildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
installPhase = ''

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, perl, unzip }:
{ lib, stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation rec {
pname = "zpaq";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4";
};
nativeBuildInputs = [ perl /* for pod2man */ unzip ];
nativeBuildInputs = [ perl /* for pod2man */ ];
preBuild = let
CPPFLAGS = with stdenv; ""

View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, unzip, xz, dpkg
{lib, stdenv, fetchurl, xz, dpkg
, libxslt, docbook_xsl, makeWrapper
, python3Packages
, perlPackages, curl, gnupg, diffutils
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";
};
nativeBuildInputs = [ makeWrapper unzip ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
(with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, unzip, libogg, libvorbis }:
{ lib, stdenv, fetchurl, libogg, libvorbis }:
stdenv.mkDerivation rec {
name = "vorbisgain-0.37";
@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
nativeBuildInputs = [ unzip ];
buildInputs = [ libogg libvorbis ];
patchPhase = ''

View file

@ -9,7 +9,6 @@
, pkg-config
, mono
, fsharp
, unzip
, overrides ? {}
}:
@ -897,8 +896,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
};
nativeBuildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" ];
outputFiles = [ "*" ];