diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:55:12 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:58:54 +0100 |
| commit | ed867a50eb89a90db3b1741bf4c0bf0cd4557dba (patch) | |
| tree | a95502fbc6cb68e944d1aa5202d024c97365b09c /pkgs/tools/filesystems/netatalk | |
| parent | 5b00625aa434205774d3e1cd43852ca1cbffc046 (diff) | |
| download | nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.gz nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.bz2 nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.lz nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.xz nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.zst nixpkgs-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.zip | |
iconv: remove usage on Linux in several packages
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.
Diffstat (limited to 'pkgs/tools/filesystems/netatalk')
| -rw-r--r-- | pkgs/tools/filesystems/netatalk/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 850e1681248..61afe6ffb90 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -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}" |