From 3772de4961db01bf666f33cfb0d1f3d01265a461 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 7 May 2016 21:49:16 +0200 Subject: libgcrypt: fix libcap lib output reference After 7382afac40c23841e5d6a491bd4a9412d766ecab --- pkgs/development/libraries/libgcrypt/1.5.nix | 2 +- pkgs/development/libraries/libgcrypt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/libgcrypt') diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index d77946e5ec37a..4287c86dbd592 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' sed -i 's,#include ,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h '' + stdenv.lib.optionalString enableCapabilities '' - sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la + sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la ''; doCheck = true; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index d566a0e8567be..dd57e74e15665 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postFixup = '' sed -i 's,#include ,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h" '' + stdenv.lib.optionalString enableCapabilities '' - sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la + sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la ''; # TODO: figure out why this is even necessary and why the missing dylib only crashes -- cgit 1.4.1