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/development/interpreters | |
| 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/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/ruby/patches.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 029e5cf18a59..5a2c206fad52 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -1,5 +1,5 @@ { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi -, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty, imagemagick +, zlib, libuuid, gems, jdk, python, stdenv, libiconv, imagemagick , pkgconfig }: let @@ -33,7 +33,7 @@ in NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; }; - iconv = { buildInputs = [ libiconvOrEmpty ]; }; + iconv = { buildInputs = [ libiconv ]; }; libv8 = { # This fix is needed to fool scons, which clears the environment by default. |