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

kill libiconvOr*

Browse Source 
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eric Seidel
2015-02-07 20:29:28 -08:00
parent 362d759750
commit e08b9ab8d3
37 changed files with 88 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/text/gnugrep/default.nix
+3 -3
View File
@@ -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;