diff options
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, 5 insertions, 5 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..522a1a05ce92 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,9 @@ stdenv.mkDerivation { sha256 = "0rcs0spsxdmh6yz8y4frkqp6f5iw19mdbdl9s2v6956hq0mlbbzh"; }; - buildInputs = [ pcre libiconvOrNull ]; + buildInputs = [ pcre libiconv ]; - NIX_LDFLAGS = stdenv.lib.optionalString (libiconvOrNull != null) "-L${libiconvOrNull}/lib -liconv"; + NIX_LDFLAGS = "-L${libiconv}/lib -liconv"; doCheck = !stdenv.isDarwin; |