pkgs/tools: stdenv.lib -> lib
This commit is contained in:
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user