summary refs log tree commit diff
path: root/pkgs/development/libraries/stfl
diff options
context:
space:
mode:
authorEric Seidel <gridaphobe@gmail.com>2014-11-26 15:16:50 -0800
committerEric Seidel <gridaphobe@gmail.com>2015-02-07 20:29:28 -0800
commite08b9ab8d3d6362c774a786797347fa7483af773 (patch)
treef64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/development/libraries/stfl
parent362d75975045c185e67cb0b66baa43d4d5e337c4 (diff)
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
Diffstat (limited to 'pkgs/development/libraries/stfl')
-rw-r--r--pkgs/development/libraries/stfl/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix
index 9e3f749ca8f47..4e24268314e83 100644
--- a/pkgs/development/libraries/stfl/default.nix
+++ b/pkgs/development/libraries/stfl/default.nix
@@ -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