diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 08:27:43 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 08:27:43 +0200 |
| commit | a70180ba73553e66d4f5555d2b4d232b4990718b (patch) | |
| tree | fb58ba9b78a15a1cb5b988aa0e8248775a0cdbfb /pkgs/tools | |
| parent | fb59f27a4368b1436518f9f76c6e2e68f60b92a6 (diff) | |
| download | nixlib-a70180ba73553e66d4f5555d2b4d232b4990718b.tar nixlib-a70180ba73553e66d4f5555d2b4d232b4990718b.tar.gz nixlib-a70180ba73553e66d4f5555d2b4d232b4990718b.tar.bz2 nixlib-a70180ba73553e66d4f5555d2b4d232b4990718b.tar.lz nixlib-a70180ba73553e66d4f5555d2b4d232b4990718b.tar.xz nixlib-a70180ba73553e66d4f5555d2b4d232b4990718b.tar.zst nixlib-a70180ba73553e66d4f5555d2b4d232b4990718b.zip | |
mutiout: make it builtin
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/xz/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/misc/findutils/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/text/diffutils/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/text/gawk/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/text/gnugrep/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/gnused/default.nix | 1 |
8 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 140294d987d5..23d3f1dd28b4 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "info" ]; - buildInputs = [ stdenv.hookLib.multiout acl ]; + buildInputs = [ acl ]; # May have some issues with root compilation because the bootstrap tool # cannot be used as a login shell for now. diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index aca5995c3bae..5889bdd5093d 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { }; outputs = [ "dev" "out" "bin" "man" "doc" ]; - buildInputs = [ stdenv.hookLib.multiout ]; doCheck = true; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index b3433ca83ec2..47757e4659ac 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -24,7 +24,6 @@ let nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] - ++ [ stdenv.hookLib.multiout ] ++ optional aclSupport acl ++ optionals selinuxSupport [ libselinux libsepol ]; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 407470870a67..b3d1d4c9e791 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { patches = [ ./findutils-path.patch ./change_echo_path.patch ]; outputs = [ "out" "info" ]; - buildInputs = [ stdenv.hookLib.multiout ]; doCheck = true; diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 9275603bad4c..680a75445ef0 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "info" ]; - buildInputs = [ stdenv.hookLib.multiout ]; /* If no explicit coreutils is given, use the one from stdenv. */ nativeBuildInputs = [ coreutils ]; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 432d7b587120..f5fbf029aad0 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { #outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo buildInputs = [ libsigsegv ] - ++ optional (!interactive) stdenv.hookLib.multiout ++ optional interactive readline; configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ] diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index e2a48085db96..d0c5b8dbd215 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { #outputs = [ "out" "doc" ]; ToDo - buildInputs = [ stdenv.hookLib.multiout pcre ] + buildInputs = [ pcre ] ++ stdenv.lib.optional (libiconv != null) libiconv; patches = [ ./test-localeconv.patch ]; diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 49ff76b85c20..037c2f17a63b 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation { }; outputs = [ "out" "info" ]; - buildInputs = [ stdenv.hookLib.multiout ]; meta = { homepage = http://www.gnu.org/software/sed/; |