diff options
author | Florian Klink <flokli@flokli.de> | 2019-11-05 15:42:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-05 15:42:44 +0100 |
commit | c3566c7a4fe240de83d5426876069e859350f088 (patch) | |
tree | 6b336cda1cfb31706d0ee7ebbc9fc560098e1924 /pkgs/tools/security | |
parent | 4db1caec0a84b4900b10ec21746a3960a25c039e (diff) | |
parent | 52ed193ec7f167579b8acbb27d02283ae9e92eff (diff) | |
download | nixlib-c3566c7a4fe240de83d5426876069e859350f088.tar nixlib-c3566c7a4fe240de83d5426876069e859350f088.tar.gz nixlib-c3566c7a4fe240de83d5426876069e859350f088.tar.bz2 nixlib-c3566c7a4fe240de83d5426876069e859350f088.tar.lz nixlib-c3566c7a4fe240de83d5426876069e859350f088.tar.xz nixlib-c3566c7a4fe240de83d5426876069e859350f088.tar.zst nixlib-c3566c7a4fe240de83d5426876069e859350f088.zip |
Merge pull request #70352 from wucke13/systemd-importd
systemd: add systemd-importd
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/gnupg/22.nix | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index f62f10c8cf9d..e54a1e1c5db9 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -1,17 +1,17 @@ { fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba -, libgpgerror, libiconv, npth, gettext, texinfo, pcsclite, sqlite -, buildPackages +, libgpgerror, libiconv, npth, gettext, texinfo, buildPackages # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. -, pinentry ? null, guiSupport ? false -, adns ? null, gnutls ? null, libusb ? null, openldap ? null -, readline ? null, zlib ? null, bzip2 ? null +, guiSupport ? true, enableMinimal ? false +, adns ? null , bzip2 ? null , gnutls ? null , libusb ? null , openldap ? null +, pcsclite ? null , pinentry ? null , readline ? null , sqlite ? null , zlib ? +null }: with stdenv.lib; -assert guiSupport -> pinentry != null; +assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \ configure doc/dirmngr.texi doc/gnupg.info-1 - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + stdenv.lib.optionalString ( stdenv.isLinux && pcsclite != null) '' sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( @@ -50,7 +50,14 @@ stdenv.mkDerivation rec { "--with-npth-prefix=${npth}" ] ++ optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"; - postInstall = '' + postInstall = if enableMinimal + then '' + rm -r $out/{libexec,sbin,share} + for f in `find $out/bin -type f -not -name gpg` + do + rm $f + done + '' else '' mkdir -p $out/lib/systemd/user for f in doc/examples/systemd-user/*.{service,socket} ; do substitute $f $out/lib/systemd/user/$(basename $f) \ |