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:55:12 +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

8
pkgs/tools/misc/mdbtools/git.nix
View File

@@ -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