pyrox.dev / nixpkgs
lol
fork atom

gnutls: split into multiple outputs

Fixed all 'gnutls}' references, too.

Vladimír Čunát 328eafa8 252b3dcc

+3 -5
unified split
+1 -1
pkgs/applications/networking/instant-messengers/blink/default.nix
··· 22 22 23 23 postInstall = '' 24 24 wrapProgram $out/bin/blink \ 25 - --prefix LD_LIBRARY_PATH ":" ${gnutls}/lib 25 + --prefix LD_LIBRARY_PATH ":" ${gnutls.lib}/lib 26 26 ''; 27 27 28 28 meta = with stdenv.lib; {
+2 -4
pkgs/development/libraries/gnutls/generic.nix
··· 13 13 14 14 inherit src patches postPatch; 15 15 16 - outputs = [ "out" "man" ]; 16 + outputs = [ "dev" "out" "bin" "man" ]; 17 17 18 18 configureFlags = 19 19 # FIXME: perhaps use $SSL_CERT_FILE instead ··· 34 34 ++ [ unbound ] 35 35 ++ lib.optional guileBindings guile; 36 36 37 - # AutoreconfHook is temporary until the patch lands upstream to fix 38 - # header file generation with parallel building 39 37 nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; 40 38 41 39 # XXX: Gnulib's `test-select' fails on FreeBSD: ··· 47 45 sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \ 48 46 -e 's,-lz,-L${zlib.out}/lib -lz,' \ 49 47 -e 's,-lgmp,-L${gmp}/lib -lgmp,' \ 50 - -i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc 48 + -i "$out/lib/libgnutls.la" "$dev/lib/pkgconfig/gnutls.pc" 51 49 ''; 52 50 53 51 meta = with lib; {