public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging

Browse Source 
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
This commit is contained in:
Shea Levy
2015-02-11 19:37:22 -05:00
parent db4cb021c0 472feaf53b
commit 127efcd6f6
37 changed files with 88 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/ruby/patches.nix
View File

@@ -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.