libgpgerror: split dev and info outputs
This commit is contained in:
parent
f8ce44d518
commit
12487536d2
@ -121,12 +121,12 @@ in
|
|||||||
network inet dgram,
|
network inet dgram,
|
||||||
network inet6 dgram,
|
network inet6 dgram,
|
||||||
|
|
||||||
${pkgs.gcc.cc}/lib/libssp.so.* mr,
|
${pkgs.gcc.cc.lib}/lib/libssp.so.* mr,
|
||||||
${pkgs.libsodium}/lib/libsodium.so.* mr,
|
${pkgs.libsodium.out}/lib/libsodium.so.* mr,
|
||||||
${pkgs.systemd}/lib/libsystemd.so.* mr,
|
${pkgs.systemd}/lib/libsystemd.so.* mr,
|
||||||
${pkgs.xz}/lib/liblzma.so.* mr,
|
${pkgs.xz.out}/lib/liblzma.so.* mr,
|
||||||
${pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
|
${pkgs.libgcrypt.out}/lib/libgcrypt.so.* mr,
|
||||||
${pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
|
${pkgs.libgpgerror.out}/lib/libgpg-error.so.* mr,
|
||||||
|
|
||||||
${resolverListFile} r,
|
${resolverListFile} r,
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
# Make sure includes are fixed for callers who don't use libassuan-config
|
# Make sure includes are fixed for callers who don't use libassuan-config
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/assuan.h
|
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/assuan.h
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
|
|||||||
# Make sure libraries are correct for .pc and .la files
|
# Make sure libraries are correct for .pc and .la files
|
||||||
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
|
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
|
||||||
'' + stdenv.lib.optionalString enableCapabilities ''
|
'' + stdenv.lib.optionalString enableCapabilities ''
|
||||||
sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la
|
sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
|
|||||||
# Make sure libraries are correct for .pc and .la files
|
# Make sure libraries are correct for .pc and .la files
|
||||||
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
|
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
|
||||||
'' + stdenv.lib.optionalString enableCapabilities ''
|
'' + stdenv.lib.optionalString enableCapabilities ''
|
||||||
sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la
|
sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# TODO: figure out why this is even necessary and why the missing dylib only crashes
|
# TODO: figure out why this is even necessary and why the missing dylib only crashes
|
||||||
|
@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";
|
postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";
|
||||||
|
|
||||||
|
outputs = [ "dev" "out" "info" ];
|
||||||
|
outputBin = "dev"; # deps want just the lib, most likely
|
||||||
|
|
||||||
# If architecture-dependent MO files aren't available, they're generated
|
# If architecture-dependent MO files aren't available, they're generated
|
||||||
# during build, so we need gettext for cross-builds.
|
# during build, so we need gettext for cross-builds.
|
||||||
crossAttrs.buildInputs = [ gettext ];
|
crossAttrs.buildInputs = [ gettext ];
|
||||||
@ -25,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html";
|
homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html";
|
||||||
description = "A small library that defines common error values for all GnuPG components";
|
description = "A small library that defines common error values for all GnuPG components";
|
||||||
|
|
||||||
@ -36,9 +39,9 @@ stdenv.mkDerivation rec {
|
|||||||
Daemon and possibly more in the future.
|
Daemon and possibly more in the future.
|
||||||
'';
|
'';
|
||||||
|
|
||||||
license = stdenv.lib.licenses.lgpl2Plus;
|
license = licenses.lgpl2Plus;
|
||||||
platforms = stdenv.lib.platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
|
maintainers = [ maintainers.fuuzetsu ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,12 +61,12 @@ stdenv.mkDerivation rec {
|
|||||||
postInstall = ''
|
postInstall = ''
|
||||||
sed -i $out/lib/libshi{sa,shi}.la \
|
sed -i $out/lib/libshi{sa,shi}.la \
|
||||||
'' + optionalString (optLibidn != null) ''
|
'' + optionalString (optLibidn != null) ''
|
||||||
-e 's,\(-lidn\),-L${optLibidn}/lib \1,' \
|
-e 's,\(-lidn\),-L${optLibidn.out}/lib \1,' \
|
||||||
'' + optionalString (optGnutls != null) ''
|
'' + optionalString (optGnutls != null) ''
|
||||||
-e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \
|
-e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \
|
||||||
'' + ''
|
'' + ''
|
||||||
-e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \
|
-e 's,\(-lgcrypt\),-L${libgcrypt.out}/lib \1,' \
|
||||||
-e 's,\(-lgpg-error\),-L${libgpgerror}/lib \1,' \
|
-e 's,\(-lgpg-error\),-L${libgpgerror.out}/lib \1,' \
|
||||||
-e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,'
|
-e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
# Fix broken .la files
|
# Fix broken .la files
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
sed 's,-lgpg-error,-L${libgpgerror}/lib -lgpg-error,' -i $out/lib/*.la
|
sed 's,-lgpg-error,-L${libgpgerror.out}/lib -lgpg-error,' -i $out/lib/*.la
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
Loading…
Reference in New Issue
Block a user