diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/libqalculate/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/openexr/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/xapian/default.nix | 4 |
5 files changed, 20 insertions, 14 deletions
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index afe77bf6e39..95768c3ab48 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,5 +1,6 @@ -{ fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound, trousers +{ lib, fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound +, tpmSupport ? false, trousers # Version dependent args , version, src, patches ? [] @@ -7,9 +8,6 @@ assert guileBindings -> guile != null; -let - inherit (stdenv.lib) optional optionals optionalString; -in stdenv.mkDerivation rec { name = "gnutls-${version}"; @@ -19,11 +17,11 @@ stdenv.mkDerivation rec { configureFlags = # FIXME: perhaps use $SSL_CERT_FILE instead - optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" + lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" ++ [ "--disable-dependency-tracking" "--enable-fast-install" - ] ++ optionals guileBindings + ] ++ lib.optional guileBindings [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; # Build of the Guile bindings is not parallel-safe. See @@ -32,9 +30,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = !guileBindings; buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ] - ++ optional stdenv.isLinux trousers + ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ [ unbound ] - ++ optional guileBindings guile; + ++ lib.optional guileBindings guile; nativeBuildInputs = [ perl pkgconfig autoreconfHook ]; @@ -43,14 +41,14 @@ stdenv.mkDerivation rec { doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); # Fixup broken libtool and pkgconfig files - preFixup = optionalString (!stdenv.isDarwin) '' - sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \ + preFixup = lib.optionalString (!stdenv.isDarwin) '' + sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ -e 's,-lz,-L${zlib}/lib -lz,' \ -e 's,-lgmp,-L${gmp}/lib -lgmp,' \ -i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The GNU Transport Layer Security Library"; longDescription = '' diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index bf1a1e232bb..3d9a288b5bb 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs"; }; + outputs = [ "out" "doc" ]; + buildInputs = [ intltool pkgconfig ]; propagatedBuildInputs = [ cln libxml2 glib ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 8ad158aafb7..73a437b0291 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig -, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection +, gnomeSupport ? false, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection , libintlOrEmpty , intltool, python }: let @@ -32,6 +32,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + postInstall = "rm -rf $out/share/gtk-doc"; + meta = { inherit (glib.meta) maintainers platforms; }; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 71420ba425c..738e7d87af6 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n"; }; + outputs = [ "out" "doc" ]; + preConfigure = '' ./bootstrap ''; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index a9334f31ecd..89f97292d39 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0grd2s6gf8yzqwdaa50g57j9d81mxkrrpkyldm2shgyizdc8gx33"; }; + outputs = [ "out" "doc" ]; + buildInputs = [ libuuid zlib ]; - meta = { + meta = { description = "Search engine library"; homepage = http://xapian.org/; license = stdenv.lib.licenses.gpl2Plus; |