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/development/libraries/glib/default.nix
+2 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, python
, libiconvOrEmpty, libintlOrEmpty, zlib, libffi, pcre, libelf
, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf
# this is just for tests (not in closure of any regular package)
, coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false
@@ -60,8 +60,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig gettext perl python ];
propagatedBuildInputs = [ pcre zlib libffi ]
++ optional (!stdenv.isDarwin) libiconvOrEmpty
propagatedBuildInputs = [ pcre zlib libffi libiconv ]
++ libintlOrEmpty;
configureFlags =