diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 11:07:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 11:07:54 +0200 |
| commit | 328eafa8857c0b4de84581935cdcb323259f2e0f (patch) | |
| tree | f12e9a86249b8ae592265ccb25381f487399d08d /pkgs | |
| parent | 252b3dcc8716d3be1cc5763d1e4807b662f3debd (diff) | |
| download | nixlib-328eafa8857c0b4de84581935cdcb323259f2e0f.tar nixlib-328eafa8857c0b4de84581935cdcb323259f2e0f.tar.gz nixlib-328eafa8857c0b4de84581935cdcb323259f2e0f.tar.bz2 nixlib-328eafa8857c0b4de84581935cdcb323259f2e0f.tar.lz nixlib-328eafa8857c0b4de84581935cdcb323259f2e0f.tar.xz nixlib-328eafa8857c0b4de84581935cdcb323259f2e0f.tar.zst nixlib-328eafa8857c0b4de84581935cdcb323259f2e0f.zip | |
gnutls: split into multiple outputs
Fixed all 'gnutls}' references, too.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/blink/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 7bb14efc1bb5..e8ebd82d0bfb 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -22,7 +22,7 @@ pythonPackages.buildPythonPackage rec { postInstall = '' wrapProgram $out/bin/blink \ - --prefix LD_LIBRARY_PATH ":" ${gnutls}/lib + --prefix LD_LIBRARY_PATH ":" ${gnutls.lib}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index d2bdc3fd2815..7cbdd8c8ca94 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit src patches postPatch; - outputs = [ "out" "man" ]; + outputs = [ "dev" "out" "bin" "man" ]; configureFlags = # FIXME: perhaps use $SSL_CERT_FILE instead @@ -34,8 +34,6 @@ stdenv.mkDerivation { ++ [ unbound ] ++ lib.optional guileBindings guile; - # AutoreconfHook is temporary until the patch lands upstream to fix - # header file generation with parallel building nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; # XXX: Gnulib's `test-select' fails on FreeBSD: @@ -47,7 +45,7 @@ stdenv.mkDerivation { sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ -e 's,-lz,-L${zlib.out}/lib -lz,' \ -e 's,-lgmp,-L${gmp}/lib -lgmp,' \ - -i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc + -i "$out/lib/libgnutls.la" "$dev/lib/pkgconfig/gnutls.pc" ''; meta = with lib; { |