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

gnutls: split into multiple outputs

Browse Source 
Fixed all 'gnutls}' references, too.
This commit is contained in:
Vladimír Čunát
2015-10-05 11:07:54 +02:00
parent 252b3dcc87
commit 328eafa885
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/instant-messengers/blink/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ pythonPackages.buildPythonPackage rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/blink \ wrapProgram $out/bin/blink \
--prefix LD_LIBRARY_PATH ":" ${gnutls}/lib --prefix LD_LIBRARY_PATH ":" ${gnutls.lib}/lib
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
pkgs/development/libraries/gnutls/generic.nix
+2 -4
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
inherit src patches postPatch; inherit src patches postPatch;
outputs = [ "out" "man" ]; outputs = [ "dev" "out" "bin" "man" ];
configureFlags = configureFlags =
# FIXME: perhaps use $SSL_CERT_FILE instead # FIXME: perhaps use $SSL_CERT_FILE instead
@@ -34,8 +34,6 @@ stdenv.mkDerivation {
++ [ unbound ] ++ [ unbound ]
++ lib.optional guileBindings guile; ++ lib.optional guileBindings guile;
# AutoreconfHook is temporary until the patch lands upstream to fix
# header file generation with parallel building
nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
# XXX: Gnulib's `test-select' fails on FreeBSD: # 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,'"} \ sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
-e 's,-lz,-L${zlib.out}/lib -lz,' \ -e 's,-lz,-L${zlib.out}/lib -lz,' \
-e 's,-lgmp,-L${gmp}/lib -lgmp,' \ -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; { meta = with lib; {