diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-17 13:52:37 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-17 13:52:37 -0500 |
| commit | 2f061ff16b3c54ce8c85bef4f873c1548be9b1c3 (patch) | |
| tree | 728d5e8d790ececee0c464099dd5eaa69b19ebdf /pkgs/tools/text | |
| parent | 6be3ffb0d4d1c8f35c89c9525a7e6e11995637c7 (diff) | |
| parent | ef6b18c0ecc4f484e0ee31144527be7ff6c42697 (diff) | |
| download | nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.gz nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.bz2 nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.lz nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.xz nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.zst nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.zip | |
Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/enca/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/text/gnugrep/default.nix | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 043f7cf5a12b..363446d409bd 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconvOrNull, recode }: +{ stdenv, fetchurl, libiconv, recode }: stdenv.mkDerivation rec { name = "enca-1.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0hg7ggldam66l9j53nlrvi2lv1k99r2qfk6dh23vg6mi05cph7bw"; }; - buildInputs = [ recode libiconvOrNull ]; + buildInputs = [ recode libiconv ]; meta = { homepage = http://freecode.com/projects/enca; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 8be986e0cbb7..0380d2d2467b 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libiconvOrNull }: +{ stdenv, fetchurl, pcre, libiconv }: let version = "2.20"; in @@ -10,9 +10,7 @@ stdenv.mkDerivation { sha256 = "0rcs0spsxdmh6yz8y4frkqp6f5iw19mdbdl9s2v6956hq0mlbbzh"; }; - buildInputs = [ pcre libiconvOrNull ]; - - NIX_LDFLAGS = stdenv.lib.optionalString (libiconvOrNull != null) "-L${libiconvOrNull}/lib -liconv"; + buildInputs = [ pcre libiconv ]; doCheck = !stdenv.isDarwin; |