public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files

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