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

Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging

Browse Source 
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
This commit is contained in:
Shea Levy
2015-02-11 19:37:22 -05:00
parent db4cb021c0 472feaf53b
commit 127efcd6f6
37 changed files with 88 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/filesystems/netatalk/default.nix
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}"

4
pkgs/tools/misc/aescrypt/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libiconvOrEmpty }:
{ stdenv, fetchurl, libiconv }:
stdenv.mkDerivation rec {
version = "3.0.9";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
cp aescrypt_keygen $out/bin
'';
buildInputs = [ libiconvOrEmpty ];
buildInputs = [ libiconv ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";

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

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig,
libiconvOrEmpty, autoconf, automake, libtool, which, txt2man, gnome_doc_utils,
libiconv, autoconf, automake, libtool, which, txt2man, gnome_doc_utils,
scrollkeeper}:
stdenv.mkDerivation {
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
buildInputs = [
glib readline bison flex pkgconfig autoconf automake
libtool which txt2man gnome_doc_utils scrollkeeper
] ++ libiconvOrEmpty;
libtool which txt2man gnome_doc_utils scrollkeeper libiconv
];
preConfigure = ''
sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c

4
pkgs/tools/package-management/disnix/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconvOrEmpty }:
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
stdenv.mkDerivation {
name = "disnix-0.3prea0484a2c19d1947c21f11b4fc7c3f6049bd11efa";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "06qjaxysnkm31rgjlqy9n7p59q5v3jl57jm9jya7zf2g90syhdn7";
};
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ];
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
dontStrip = true;

12
pkgs/tools/security/clamav/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, bzip2, libiconvOrNull, libxml2, openssl, ncurses, curl }:
{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }:
stdenv.mkDerivation rec {
name = "clamav-${version}";
version = "0.98.6";
@@ -8,20 +8,18 @@ stdenv.mkDerivation rec {
sha256 = "0l99a0shgzpl8rvrrgbm1ki2zxlb7g1n82bhq7f2snj4amfj94b5";
};
buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl ]
++ stdenv.lib.optional (libiconvOrNull != null) libiconvOrNull;
buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv ];
configureFlags = [
"--with-zlib=${zlib}"
"--with-libbz2-prefix=${bzip2}"
] ++ (stdenv.lib.optional (libiconvOrNull != null)
"--with-iconv-dir=${libiconvOrNull}")
++ [
"--with-iconv-dir=${libiconv}"
"--with-xml=${libxml2}"
"--with-openssl=${openssl}"
"--with-libncurses-prefix=${ncurses}"
"--with-libcurl=${curl}"
"--disable-clamav" ];
"--disable-clamav"
];
meta = with stdenv.lib; {
homepage = http://www.clamav.net;

5
pkgs/tools/security/gnupg/20.nix
View File

@@ -1,5 +1,5 @@
{ fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan
, libksba, coreutils, libiconvOrEmpty
, libksba, coreutils, libiconv
# Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality.
, pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
buildInputs
= [ readline zlib libgpgerror libgcrypt libassuan libksba pth
openldap bzip2 libusb curl ]
++ libiconvOrEmpty;
openldap bzip2 libusb curl libiconv ];
patchPhase = ''
find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i

4
pkgs/tools/security/opensc/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconvOrNull, pcsclite
{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite
, libassuan1, pkgconfig, libXt, docbook_xsl, libxslt, docbook_xml_dtd_412
}:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig
libXt libxslt libiconvOrNull docbook_xml_dtd_412
libXt libxslt libiconv docbook_xml_dtd_412
];
configureFlags = [

4
pkgs/tools/text/enca/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libiconvOrNull, recode }:
{ stdenv, fetchurl, libiconv, recode }:
stdenv.mkDerivation rec {
name = "enca-1.16";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0hg7ggldam66l9j53nlrvi2lv1k99r2qfk6dh23vg6mi05cph7bw";
};
buildInputs = [ recode libiconvOrNull ];
buildInputs = [ recode libiconv ];
meta = {
homepage = http://freecode.com/projects/enca;

6
pkgs/tools/text/gnugrep/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pcre, libiconvOrNull }:
{ stdenv, fetchurl, pcre, libiconv }:
let version = "2.20"; in
@@ -10,9 +10,7 @@ stdenv.mkDerivation {
sha256 = "0rcs0spsxdmh6yz8y4frkqp6f5iw19mdbdl9s2v6956hq0mlbbzh";
};
buildInputs = [ pcre libiconvOrNull ];
NIX_LDFLAGS = stdenv.lib.optionalString (libiconvOrNull != null) "-L${libiconvOrNull}/lib -liconv";
buildInputs = [ pcre libiconv ];
doCheck = !stdenv.isDarwin;

6
pkgs/tools/typesetting/docbook2x/default.nix
View File

@@ -1,6 +1,6 @@
{ fetchurl, stdenv, texinfo, perl
, XMLSAX, XMLParser, XMLNamespaceSupport
, groff, libxml2, libxslt, gnused, libiconvOrEmpty, opensp
, groff, libxml2, libxslt, gnused, libiconv, opensp
, docbook_xml_dtd_43
, makeWrapper }:
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
patches = [ ./db2x_texixml-to-stdout.patch ];
buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper
XMLSAX XMLParser XMLNamespaceSupport opensp
] ++ libiconvOrEmpty;
XMLSAX XMLParser XMLNamespaceSupport opensp libiconv
];
postConfigure = ''
# Broken substitution is used for `perl/config.pl', which leaves literal