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

iconv: remove usage on Linux in several packages

Browse Source 
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
This commit is contained in:
Vladimír Čunát
2014-11-03 12:58:54 +01:00
parent 5b00625aa4
commit ed867a50eb
7 changed files with 30 additions and 22 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, libiconv, pam, openssl }:
{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconvOrEmpty, pam, openssl }:
stdenv.mkDerivation rec {
name = "netatalk-3.1.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
};
buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl ];
buildInputs = [ pkgconfig db libgcrypt avahi pam openssl ] ++ libiconvOrEmpty;
configureFlags = [
"--with-bdb=${db}"