diff options
Diffstat (limited to 'pkgs/tools/misc')
23 files changed, 34 insertions, 27 deletions
diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index e0f84329b89..39cfcefaee8 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1qpylyxrisy3p2lyirfarfj5yzrdjgsgxwf8gqwljpcjn207hr72"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -Dm755 0x0 $out/bin/0x0 diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index e25543b5145..720b0a875a8 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { URI ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ perlPackages.perl libpcap makeWrapper ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ perlPackages.perl libpcap ]; postInstall = '' for name in get-{oui,iab}; do diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index c647d3b3902..ffe3fd0fe16 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ perl makeWrapper gettext ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl gettext ]; propagatedBuildInputs = [ textual-window-manager screen ]; postPatch = '' diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index d0e6c167349..d858e0fbc46 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0zyyg4mvrny7cc2xgvfip97b6yc75ka5ni39rwls93971jbk83d6"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -Dm755 src/capture.sh $out/bin/capture diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index f518c1b8e3f..3e18d3f4b54 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */Unix) ''; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ - perl AlgorithmDiff ParallelForkManager RegexpCommon - ]); + nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ perl AlgorithmDiff ParallelForkManager RegexpCommon ]); makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ]; diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 8de7cc99336..cbeede0cc30 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -16,7 +16,8 @@ in stdenv.mkDerivation rec { sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; - buildInputs = [ unzip xz dpkg libxslt python setuptools makeWrapper curl gnupg diffutils ] ++ + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ unzip 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/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 5be309be582..8ebb2924b03 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontStrip = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ]; passthru.tests = { inherit (nixosTests) graylog; }; diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix index ed47e477854..83d8a770419 100644 --- a/pkgs/tools/misc/ix/default.nix +++ b/pkgs/tools/misc/ix/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "installPhase" "fixupPhase" ]; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 49b3ffbb7dd..61abb3eee10 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; }; - buildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; installPhase = '' mkdir -p $out/{bin,share/man/man1} diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index d33cdbacb15..fd8b805743a 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; }; - buildInputs = [ goobook makeWrapper perl ConvertASN1 perlldap AuthenSASL ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ goobook perl ConvertASN1 perlldap AuthenSASL ] ++ optional (!stdenv.isDarwin) finger_bsd ++ optional (abook != null) abook ++ optional (gnupg != null) gnupg diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index ad2d0127ab0..7a066428687 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook ''; - buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 ] ++ optional stdenv.isDarwin darwin.cctools; propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index c5ac32af3be..0c021591e5e 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0ri7qmpc1xpy12lpzl6k298c641wcibcwrzz8jn75wdg4rr176r5"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; libPath = lib.makeLibraryPath [ xorg.libX11 diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 168eda1cf3d..678c2607b61 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2"; }; - buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ autoconf automake curl jdk nettools python git ]; preConfigure = '' patchShebangs ./build-aux/ diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index 07279400fc4..bc5dbe4672e 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-mfv1b40n/opXdyj6IXWVf/32sWlS+/DbXIRwE1zX4KM="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' # executables install -Dt $out/bin os-prober linux-boot-prober diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix index eacbc0d6bd2..48b819d5bfd 100644 --- a/pkgs/tools/misc/pb_cli/default.nix +++ b/pkgs/tools/misc/pb_cli/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0w6a789zffvz4ixsb92q45n5s4xyx7s2l2f07972i3dajaaai8z7"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; liveDeps = [ jq curl ] ++ lib.optional screenshots maim ++ lib.optional video capture diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 7ffbd8ded1c..009d841bf55 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2 ''; - buildInputs = [ libusb-compat-0_1 makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libusb-compat-0_1 ]; meta = { homepage = "https://www.microchip.com/pickit2"; diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index d9c208510fc..0b5005b9c82 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1p8s60dlzaldp006yj710s371aan915asyjhd99188vrj4jj1x79"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index b94ca6cfea3..113c2b05ff5 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3"; }; - buildInputs = [ python3 texinfo makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 texinfo ]; inherit python3; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index c8a2b338817..77f865a6a16 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "11sjf4j9dr6ih9jkg6vqq6gkfg6wly4182bi1008bsm1zdmm5iz7"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' PREFIX=\"\" DESTDIR=$out make install diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index 0edec63c8c9..e98323b75ee 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "pws-${(import ./gemset.nix).pws.version}"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; phases = ["installPhase"]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 423135d53fd..1cfc039273e 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -18,8 +18,8 @@ in stdenv.mkDerivation rec { }; pythonPaths = [ pycrypto pyyaml requests ]; - buildInputs = [ python perl nose mock makeWrapper python-dateutil setuptools ] ++ pythonPaths; - nativeBuildInputs = [ gitMinimal zip ]; + buildInputs = [ python perl nose mock python-dateutil setuptools ] ++ pythonPaths; + nativeBuildInputs = [ gitMinimal zip makeWrapper ]; postPatch = '' substituteInPlace scripts/run-tests.sh \ diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/tools/misc/tmux-cssh/default.nix index f3f53627956..830c365fa40 100644 --- a/pkgs/tools/misc/tmux-cssh/default.nix +++ b/pkgs/tools/misc/tmux-cssh/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "473e27f3b69864b905d1340d97917cd202705c761611eb3aec4c24521f69b52c"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index a0392bf4754..05750b962f0 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation { name = "xvfb-run"; - buildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin cp ${xvfb_run} $out/bin/xvfb-run |