diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 16:19:50 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 17:12:36 +0700 |
commit | 8c5d37129fc5097d9fb52e95fb07de75392d1c3c (patch) | |
tree | 40cfd341b87811008151e9ecf053cf7449574b98 /pkgs/tools/security/gnupg | |
parent | 94f36839357387fd711d17d762d88c69767f265b (diff) |
pkgs/tools: stdenv.lib -> lib
Diffstat (limited to 'pkgs/tools/security/gnupg')
-rw-r--r-- | pkgs/tools/security/gnupg/22.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index a6b0d43aae210..8dd0c779c3bfd 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -9,7 +9,7 @@ null }: -with stdenv.lib; +with lib; assert guiSupport -> pinentry != null && enableMinimal == false; @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in - '' + stdenv.lib.optionalString ( stdenv.isLinux && pcsclite != null) '' - sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + '' + lib.optionalString ( stdenv.isLinux && pcsclite != null) '' + sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; |