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

libgpgerror: split dev and info outputs

Browse Source
This commit is contained in:
Vladimír Čunát 2015-10-11 21:59:52 +02:00
parent f8ce44d518
commit 12487536d2
7 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/networking/dnscrypt-proxy.nix
View File

@ -121,12 +121,12 @@ in
network inet dgram,
network inet6 dgram,
${pkgs.gcc.cc}/lib/libssp.so.* mr,
${pkgs.libsodium}/lib/libsodium.so.* mr,
${pkgs.gcc.cc.lib}/lib/libssp.so.* mr,
${pkgs.libsodium.out}/lib/libsodium.so.* mr,
${pkgs.systemd}/lib/libsystemd.so.* mr,
${pkgs.xz}/lib/liblzma.so.* mr,
${pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
${pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
${pkgs.xz.out}/lib/liblzma.so.* mr,
${pkgs.libgcrypt.out}/lib/libgcrypt.so.* mr,
${pkgs.libgpgerror.out}/lib/libgpg-error.so.* mr,
${resolverListFile} r,
}

2
pkgs/development/libraries/libassuan/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
# Make sure includes are fixed for callers who don't use libassuan-config
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 = {

4
pkgs/development/libraries/libgcrypt/1.5.nix
View File

@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
# Make sure libraries are correct for .pc and .la files
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
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 ''
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;

4
pkgs/development/libraries/libgcrypt/default.nix
View File

@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
# Make sure libraries are correct for .pc and .la files
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
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 ''
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

11
pkgs/development/libraries/libgpg-error/default.nix
View File

@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
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
# during build, so we need gettext for cross-builds.
crossAttrs.buildInputs = [ gettext ];
@ -25,7 +28,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
meta = with stdenv.lib; {
homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html";
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.
'';
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
license = licenses.lgpl2Plus;
platforms = platforms.all;
maintainers = [ maintainers.fuuzetsu ];
};
}

6
pkgs/servers/shishi/default.nix
View File

@ -61,12 +61,12 @@ stdenv.mkDerivation rec {
postInstall = ''
sed -i $out/lib/libshi{sa,shi}.la \
'' + optionalString (optLibidn != null) ''
-e 's,\(-lidn\),-L${optLibidn}/lib \1,' \
-e 's,\(-lidn\),-L${optLibidn.out}/lib \1,' \
'' + optionalString (optGnutls != null) ''
-e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \
'' + ''
-e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \
-e 's,\(-lgpg-error\),-L${libgpgerror}/lib \1,' \
-e 's,\(-lgcrypt\),-L${libgcrypt.out}/lib \1,' \
-e 's,\(-lgpg-error\),-L${libgpgerror.out}/lib \1,' \
-e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,'
'';

2
pkgs/tools/admin/gtk-vnc/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
# Fix broken .la files
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; {