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

4
pkgs/tools/filesystems/netatalk/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconvOrEmpty, pam, openssl }:
{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }:
stdenv.mkDerivation rec {
name = "netatalk-3.1.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
};
buildInputs = [ pkgconfig db libgcrypt avahi pam openssl ] ++ libiconvOrEmpty;
buildInputs = [ pkgconfig db libgcrypt avahi pam openssl libiconv ];
configureFlags = [
"--with-bdb=${db}"