diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-11 19:37:22 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-11 19:37:22 -0500 |
| commit | 127efcd6f6bf5870b43efe588e37c28994ea94fa (patch) | |
| tree | bc9d5201e0809ea8ae47c38e7ce0d2fb15e7870e /pkgs/development/compilers | |
| parent | db4cb021c024b65c08a3791edf2d4c613e8d44d8 (diff) | |
| parent | 472feaf53becef9cc0551babc44a1f5db3beed51 (diff) | |
| download | nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.gz nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.bz2 nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.lz nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.xz nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.zst nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.zip | |
Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv Conflicts: pkgs/applications/audio/ncmpcpp/default.nix
Diffstat (limited to 'pkgs/development/compilers')
| -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; } |