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

kill libiconvOr*

Browse Source 
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
This commit is contained in:
Eric Seidel
2015-02-07 20:29:28 -08:00
parent 362d759750
commit e08b9ab8d3
37 changed files with 88 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/netatalk/default.nix
+2 -2
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}"