mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
gnutls: split into multiple outputs
Fixed all 'gnutls}' references, too.
This commit is contained in:
parent
252b3dcc87
commit
328eafa885
|
@ -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; {
|
||||
|
|
|
@ -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; {
|
||||
|
|
Loading…
Reference in a new issue