swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Alexis Hildebrandt 2023-04-16 07:27:33 +02:00 committed by GitHub
parent f92d7c3a20
commit f35c2b0b92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/security/gnupg/22.nix
View file

@ -7,10 +7,6 @@
, guiSupport ? stdenv.isDarwin, pinentry
}:
let
pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
in
assert guiSupport -> enableMinimal == false;
stdenv.mkDerivation rec {
@ -53,7 +49,7 @@ stdenv.mkDerivation rec {
"--with-ksba-prefix=${libksba.dev}"
"--with-npth-prefix=${npth}"
]
++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"
++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentry.binaryPath or "bin/pinentry"}"
++ lib.optional stdenv.isDarwin "--disable-ccid-driver";
postInstall = if enableMinimal

6
pkgs/tools/security/gnupg/24.nix
View file

@ -8,10 +8,6 @@
, withTpm2Tss ? !stdenv.isDarwin && !enableMinimal, tpm2-tss
}:
let
pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
in
assert guiSupport -> enableMinimal == false;
stdenv.mkDerivation rec {
@ -54,7 +50,7 @@ stdenv.mkDerivation rec {
"--with-ksba-prefix=${libksba.dev}"
"--with-npth-prefix=${npth}"
]
++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"
++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentry.binaryPath or "bin/pinentry"}"
++ lib.optional withTpm2Tss "--with-tss=intel"
++ lib.optional stdenv.isDarwin "--disable-ccid-driver";