diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-14 14:15:06 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-22 16:50:11 -0500 |
| commit | ed2a9cf65fe2bf02bc3e7070ca4b124260d99585 (patch) | |
| tree | eabfdcf2e6203d6da7f1ada80a785455533c9c80 /pkgs/development/libraries/libinfinity | |
| parent | 9e75fb5eb4f26de4e551137c3caaa78b9bf8b050 (diff) | |
| download | nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.gz nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.bz2 nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.lz nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.xz nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.zst nixpkgs-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.zip | |
treewide: remove libintl hacks
Diffstat (limited to 'pkgs/development/libraries/libinfinity')
| -rw-r--r-- | pkgs/development/libraries/libinfinity/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 9bbb8f0e129..944cf7a6f5e 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -4,7 +4,7 @@ , avahiSupport ? false # build support for Avahi in libinfinity , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl , gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss -, libintlOrEmpty }: +, libintl }: let edf = flag: feature: (if flag then "--with-" else "--without-") + feature; @@ -19,14 +19,14 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 gsasl libidn gss libintlOrEmpty ] + buildInputs = [ glib libxml2 gsasl libidn gss libintl ] ++ optional gtkWidgets gtk2 ++ optional documentation gtkdoc ++ optional avahiSupport avahi ++ optional daemon libdaemon; propagatedBuildInputs = [ gnutls ]; - + configureFlags = '' ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"} ${edf gtkWidgets "inftextgtk"} @@ -36,8 +36,6 @@ in stdenv.mkDerivation rec { ${edf avahiSupport "avahi"} ''; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = { homepage = http://gobby.0x539.de/; description = "An implementation of the Infinote protocol written in GObject-based C"; |