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/misc/mdbtools/git.nix | |
| parent | 5b00625aa434205774d3e1cd43852ca1cbffc046 (diff) | |
| download | nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.gz nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.bz2 nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.lz nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.xz nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.zst nixlib-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/misc/mdbtools/git.nix')
| -rw-r--r-- | pkgs/tools/misc/mdbtools/git.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index b97af331093b..11b5520c7bb2 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconv, autoconf, automake, libtool, which, txt2man, gnome_doc_utils, + libiconvOrEmpty, autoconf, automake, libtool, which, txt2man, gnome_doc_utils, scrollkeeper}: stdenv.mkDerivation { @@ -12,8 +12,10 @@ stdenv.mkDerivation { name = "mdbtools-git-export"; }; - buildInputs = [glib readline bison flex pkgconfig libiconv autoconf automake - libtool which txt2man gnome_doc_utils scrollkeeper ]; + buildInputs = [ + glib readline bison flex pkgconfig autoconf automake + libtool which txt2man gnome_doc_utils scrollkeeper + ] ++ libiconvOrEmpty; preConfigure = '' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c |