kill libiconvOr*

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
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, libiconvOrEmpty }:
{ stdenv, fetchurl, ncurses, libiconv }:
stdenv.mkDerivation rec {
name = "stfl-0.22";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "062lqlf3qhp8bcapbpc0k3wym7x6ngncql8jmx5x06p6679szp9d";
};
buildInputs = [ ncurses ] ++ libiconvOrEmpty;
buildInputs = [ ncurses libiconv ];
buildPhase = ''
sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h