diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2014-11-26 15:16:50 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-07 20:29:28 -0800 |
| commit | e08b9ab8d3d6362c774a786797347fa7483af773 (patch) | |
| tree | f64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/development/compilers/vala | |
| parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) | |
| download | nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.gz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.bz2 nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.lz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.xz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.zst nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.zip | |
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/compilers/vala')
| -rw-r--r-- | pkgs/development/compilers/vala/0.26.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/vala/default.nix | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/compilers/vala/0.26.nix b/pkgs/development/compilers/vala/0.26.nix index 48b5476fe1d0..4cc07eb7d9d7 100644 --- a/pkgs/development/compilers/vala/0.26.nix +++ b/pkgs/development/compilers/vala/0.26.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconvOrEmpty, libintlOrEmpty +, glib, libiconv, libintlOrEmpty }: let @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - buildInputs = [ glib ] - ++ libiconvOrEmpty + buildInputs = [ glib libiconv ] ++ libintlOrEmpty; } diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 38c3ead7bff2..13b9c5f39832 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconvOrEmpty, libintlOrEmpty +, glib, libiconv, libintlOrEmpty }: let @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - buildInputs = [ glib ] - ++ libiconvOrEmpty + buildInputs = [ glib libiconv ] ++ libintlOrEmpty; } |