public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging

Browse Source 
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
This commit is contained in:
Shea Levy
2015-02-11 19:37:22 -05:00
parent db4cb021c0 472feaf53b
commit 127efcd6f6
37 changed files with 88 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/vala/0.26.nix
View File

@@ -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;
}

5
pkgs/development/compilers/vala/default.nix
View File

@@ -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;
}