diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-11 19:37:22 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-11 19:37:22 -0500 |
| commit | 127efcd6f6bf5870b43efe588e37c28994ea94fa (patch) | |
| tree | bc9d5201e0809ea8ae47c38e7ce0d2fb15e7870e /pkgs/tools/text | |
| parent | db4cb021c024b65c08a3791edf2d4c613e8d44d8 (diff) | |
| parent | 472feaf53becef9cc0551babc44a1f5db3beed51 (diff) | |
| download | nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.gz nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.bz2 nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.lz nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.xz nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.zst nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.zip | |
Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv Conflicts: pkgs/applications/audio/ncmpcpp/default.nix
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; |