diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-27 01:14:09 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-27 01:14:09 +0200 |
commit | fb59f27a4368b1436518f9f76c6e2e68f60b92a6 (patch) | |
tree | a68c3ac03a7ea04fd4b756a9d3cabf2667896e62 /pkgs/tools/text | |
parent | 4dccb224c584194e964b5fbef5fe2cee28c57803 (diff) | |
download | nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.gz nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.bz2 nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.lz nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.xz nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.zst nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.zip |
WIP: getting good
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/diffutils/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/gawk/default.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/text/gnugrep/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/gnused/default.nix | 5 |
4 files changed, 21 insertions, 8 deletions
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index f8413b9a0d0f..9275603bad4c 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1761vymxbp4wb5rzjvabhdkskk95pghnn67464byvzb5mfl8jpm2"; }; + 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 8866888a7367..432d7b587120 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }: +{ stdenv, fetchurl, libsigsegv, readline, interactive ? false }: +let + inherit (stdenv.lib) optional; +in stdenv.mkDerivation rec { name = "gawk-4.1.0"; @@ -8,15 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0hin2hswbbd6kd6i4zzvgciwpl5fba8d2s524z8y5qagyz3x010q"; }; - doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1 + # When we do build separate interactive version, it makes sense to always include docs. + #outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo buildInputs = [ libsigsegv ] - ++ stdenv.lib.optional readlineSupport readline; + ++ optional (!interactive) stdenv.hookLib.multiout + ++ optional interactive readline; configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ] - ++ stdenv.lib.optional readlineSupport "--with-readline=${readline}" - # only darwin where reported, seems OK on non-chrooted Fedora (don't rebuild stdenv) - ++ stdenv.lib.optional (!readlineSupport && stdenv.isDarwin) "--without-readline"; + ++ [(if interactive then "--with-readline=${readline}" else "--without-readline")]; + + doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1 postInstall = "rm $out/bin/gawk-*"; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 6e83bd357b27..e2a48085db96 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation { sha256 = "1qbjb1l7f9blckc5pqy8jlf6482hpx4awn2acmhyf5mv9wfq03p7"; }; - buildInputs = [ pcre ] + #outputs = [ "out" "doc" ]; ToDo + + buildInputs = [ stdenv.hookLib.multiout 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 b1c5910029dd..49ff76b85c20 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "gnused-4.2.2"; @@ -8,6 +8,9 @@ stdenv.mkDerivation { sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; }; + outputs = [ "out" "info" ]; + buildInputs = [ stdenv.hookLib.multiout ]; + meta = { homepage = http://www.gnu.org/software/sed/; description = "GNU sed, a batch stream editor"; |