nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnupg: remove ? null from inputs, remove with lib

Browse Source
This commit is contained in:
Sandro Jäckel 2022-07-29 19:55:55 +02:00
parent f0df0acc16
commit 32904b7870
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/tools/security/gnupg/23.nix
View File

@ -1,17 +1,11 @@
{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libgcrypt, libassuan, libksba
, libgpg-error, libiconv, npth, gettext, texinfo, buildPackages
# Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality.
, guiSupport ? stdenv.isDarwin, enableMinimal ? false
, adns ? null, bzip2 ? null , gnutls ? null , libusb1 ? null , openldap ? null
, tpm2-tss ? null
, pcsclite ? null , pinentry ? null , readline ? null , sqlite ? null , zlib ? null
, adns, bzip2, gnutls, libusb1, openldap
, tpm2-tss, pcsclite, pinentry, readline, sqlite, zlib
}:
with lib;
assert guiSupport -> pinentry != null && enableMinimal == false;
assert guiSupport -> enableMinimal == false;
stdenv.mkDerivation rec {
pname = "gnupg";
@ -26,8 +20,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config texinfo ];
buildInputs = [
libgcrypt libassuan libksba libiconv npth gettext
] ++ lib.optionals (!enableMinimal) ([
readline libusb1 gnutls adns openldap zlib bzip2 sqlite
] ++ optional (!stdenv.isDarwin) tpm2-tss ;
] ++ lib.optional (!stdenv.isDarwin) tpm2-tss);
patches = [
./fix-libusb-include-path.patch
@ -43,7 +38,7 @@ stdenv.mkDerivation rec {
];
postPatch = ''
sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1
'' + lib.optionalString (stdenv.isLinux && pcsclite != null) ''
'' + lib.optionalString (stdenv.isLinux && (!enableMinimal)) ''
sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
'';
@ -54,8 +49,8 @@ stdenv.mkDerivation rec {
"--with-libassuan-prefix=${libassuan.dev}"
"--with-ksba-prefix=${libksba.dev}"
"--with-npth-prefix=${npth}"
] ++ optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"
++ optional ( (!stdenv.isDarwin) && (tpm2-tss != null) ) "--with-tss=intel";
] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"
++ lib.optional ((!stdenv.isDarwin) && (!enableMinimal)) "--with-tss=intel";
postInstall = if enableMinimal
then ''
rm -r $out/{libexec,sbin,share}