diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:52:03 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:48 +0200 |
commit | 3096d03435bb177af8c4868a8efa637b393f2715 (patch) | |
tree | b5353e40eb18bba0e86b04a176879f3e635f48e7 /pkgs/development/libraries/libgcrypt | |
parent | 4f60156afbb8d61d8d28db8ab594ec9328946d71 (diff) | |
download | nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.gz nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.bz2 nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.lz nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.xz nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.zst nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.zip |
Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
This reverts commit 25a148fa196b944b3f134527da87e43d88c066f9.
Diffstat (limited to 'pkgs/development/libraries/libgcrypt')
-rw-r--r-- | pkgs/development/libraries/libgcrypt/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 702d54392a6..7d327a499bc 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -5,9 +5,16 @@ , libcap ? null, pth ? null }: -with stdenv; -with stdenv.lib; let + mkFlag = trueStr: falseStr: cond: name: val: + if cond == null then null else + "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; + mkEnable = mkFlag "enable-" "disable-"; + mkWith = mkFlag "with-" "without-"; + mkOther = mkFlag "" "" true; + + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + optLibcap = shouldUsePkg libcap; #optPth = shouldUsePkg pth; optPth = null; # Broken as of 1.6.3 @@ -31,13 +38,13 @@ stdenv.mkDerivation rec { # 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 - '' + optionalString (!stdenv.isDarwin && optLibcap != null) '' + '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) '' sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la ''; doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = https://www.gnu.org/software/libgcrypt/; description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; |