diff options
Diffstat (limited to 'pkgs/tools')
28 files changed, 39 insertions, 37 deletions
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 7c9f9ac7d63..a7663bbd231 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4"; }; - nativeBuildInputs = [ perl /* for pod2man */ ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ perl /* for pod2man */ unzip ]; preBuild = let CPPFLAGS = with stdenv; "" diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 1ff204babc1..c2f214ea2a6 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { sourceRoot = "."; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildPhase = '' g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/tools/cd-dvd/uif2iso/default.nix index d37cc649d38..ac0879e3217 100644 --- a/pkgs/tools/cd-dvd/uif2iso/default.nix +++ b/pkgs/tools/cd-dvd/uif2iso/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp"; }; - buildInputs = [unzip zlib]; + nativeBuildInputs = [ unzip ]; + buildInputs = [zlib]; installPhase = '' make -C . prefix="$out" install; diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 865e0f141ff..28deabb98d1 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ] ++ (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]); + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]); installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 6201b2d5888..8350e95188d 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip python ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ python ]; broken = true; # Not found. diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index a4772cad3c4..5f6e655882a 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; - buildInputs = [ qt4 unzip libGLU ]; - nativeBuildInputs = [ qmake4Hook makeWrapper ]; + buildInputs = [ qt4 libGLU ]; + nativeBuildInputs = [ qmake4Hook makeWrapper unzip ]; # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: patches = [ ./gcc47.patch ]; diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix index 6829de9241b..62744513641 100644 --- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix +++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { maintainers = [ maintainers.gebner ]; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; makeFlags = [ "installpath=$(out)/share/tegaki/models/zinnia/" ]; } diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index cbeede0cc30..b2e753342d9 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -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 = '' diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 05dcd36c40c..b0dc4f1e3df 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -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"; diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index f91acbf264a..c6bd2c53844 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297"; }; unpackCmd = "unzip $src"; - buildInputs = [ unzip file ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ file ]; dontBuild = true; installPhase = '' diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 0355fe58f48..8df7f34bb23 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -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 ]; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 117199617e1..abd8398601c 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -18,8 +18,7 @@ stdenv.mkDerivation { sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; - nativeBuildInputs = [ copyDesktopItems ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ copyDesktopItems unzip ]; inherit jre; installPhase = '' diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 7cf1e14dc18..3f86a073c09 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -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 ]; diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index a073417be7d..d88e0bdea15 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0jfyxjxsjx29xhs3fl0f574nyncmk9j5jp8zlgd401mcaznn9c7l"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index fe405b0eaa4..6cc13e6f87e 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ unzip libogg libvorbis ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ libogg libvorbis ]; patchPhase = '' chmod -v +x configure diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index c220f24046f..5964c9de3eb 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -51,8 +51,8 @@ in stdenv.mkDerivation rec { patches = [ ./40103-iostat-fix.patch ]; + nativeBuildInputs = [ unzip ]; buildInputs = [ - unzip makeWrapper ] ++ (with python'.pkgs; [ requests diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index 6453b2fbb16..1c72be0c510 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar"; sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd"; }; -# buildInputs = [unzip]; + inherit jdk swt; meta = { diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index c8188fe4216..71bdfae4e42 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' mkdir bmrsa diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix index ef462f5bf2d..5bda55c418a 100644 --- a/pkgs/tools/security/chntpw/default.nix +++ b/pkgs/tools/security/chntpw/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1k1cxsj0221dpsqi5yibq2hr7n8xywnicl8yyaicn91y8h2hkqln"; }; - buildInputs = [ unzip ] - ++ lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; + nativeBuildInputs = [ unzip ]; + buildInputs = lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; patches = [ ./00-chntpw-build-arch-autodetect.patch diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index b7c4319fa05..aa1580e2459 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0ik26sxgqgsqplksl87z61vwmx51k7plaqmrkdid7xidgfhfxr42"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' unzip $src diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index 94800ca8c04..3745a9520f1 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "134fq84896w5vp8vg4qg0ybpb466njibigyd7bqqm1xydr07qrgn"; }; - buildInputs = [ libxml2 file p7zip unrar unzip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ libxml2 file p7zip unrar ]; buildFlags = lib.optional stdenv.cc.isClang "CC=clang"; installFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/tools/security/sonar-scanner-cli/default.nix b/pkgs/tools/security/sonar-scanner-cli/default.nix index f5ae475a45b..95db01370b4 100644 --- a/pkgs/tools/security/sonar-scanner-cli/default.nix +++ b/pkgs/tools/security/sonar-scanner-cli/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { src = fetchurl sonarScannerArchPackage.${stdenv.hostPlatform.system}; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $out/lib diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 9256abf3cbd..30482196322 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { hash = "sha256-IZhRg2JcYQXQKU/lYZpLLcsSdjZZO+toY5yvk+RKUCY="; }; - buildInputs = [ unzip jre ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ jre ]; desktopItem = makeDesktopItem { name = "basex"; diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix index d5b6a7f9f97..4f896ef32ba 100644 --- a/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1qjkjhpc4rm62qxn18r83zdlwnj1wvnkcpdiqlv7w4bakh0gvjly"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = " mkdir -p $out/share/texmf-nix/tex/generic/lkproof diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index 42320b49b3d..b33f05d34a7 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; # Multiple files problem unpackPhase = '' diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index aecf32c5874..fe928615eb4 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = "unzip $src"; diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index 00df6bd97e1..8e6d7b06d17 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -5,8 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.7"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; src = fetchurl { url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip"; diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 0c3aec2aadf..475b97abdcc 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' |