pkgs/tools: stdenv.lib -> lib

This commit is contained in:
Ben Siraphob
2021-01-15 17:12:36 +07:00
parent 94f3683935
commit 8c5d37129f
916 changed files with 2510 additions and 2510 deletions
+5 -5
View File
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl libassuan libgcrypt ]
++ stdenv.lib.optional doCheck
++ lib.optional doCheck
([ gnupg opensshUnsafe which socat cpio hexdump procps lockfileProgs ] ++
(with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ]));
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
# but they aren't enabled by default because they "drain" entropy (GnuPG
# still uses /dev/random).
doCheck = false;
preCheck = stdenv.lib.optionalString doCheck ''
preCheck = lib.optionalString doCheck ''
patchShebangs tests/
patchShebangs src/
sed -i \
@@ -64,12 +64,12 @@ in stdenv.mkDerivation rec {
CryptOpenSSLRSA
CryptOpenSSLBignum
])
+ stdenv.lib.optionalString
+ lib.optionalString
(builtins.length runtimeDeps > 0)
" --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}";
" --prefix PATH : ${lib.makeBinPath runtimeDeps}";
wrapMonkeysphere = runtimeDeps: program:
"wrapProgram $out/bin/${program} ${wrapperArgs runtimeDeps}\n";
wrapPrograms = runtimeDeps: programs: stdenv.lib.concatMapStrings
wrapPrograms = runtimeDeps: programs: lib.concatMapStrings
(wrapMonkeysphere runtimeDeps)
programs;
in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ]