pkgs/tools: stdenv.lib -> lib
This commit is contained in:
@@ -26,7 +26,7 @@ let
|
||||
env = extensions:
|
||||
let
|
||||
selected = [ pass ] ++ extensions passExtensions
|
||||
++ stdenv.lib.optional tombPluginSupport passExtensions.tomb;
|
||||
++ lib.optional tombPluginSupport passExtensions.tomb;
|
||||
in buildEnv {
|
||||
name = "pass-extensions-env";
|
||||
paths = selected;
|
||||
@@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
./set-correct-program-name-for-sleep.patch
|
||||
./extension-dir.patch
|
||||
] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch
|
||||
] ++ lib.optional stdenv.isDarwin ./no-darwin-getopt.patch
|
||||
# TODO (@Ma27) this patch adds support for wl-clipboard and can be removed during the next
|
||||
# version bump.
|
||||
++ stdenv.lib.optional waylandSupport ./clip-wayland-support.patch;
|
||||
++ lib.optional waylandSupport ./clip-wayland-support.patch;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
|
||||
cp "contrib/dmenu/passmenu" "$out/bin/"
|
||||
'';
|
||||
|
||||
wrapperPath = with stdenv.lib; makeBinPath ([
|
||||
wrapperPath = with lib; makeBinPath ([
|
||||
coreutils
|
||||
findutils
|
||||
getopt
|
||||
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
|
||||
# Ensure all dependencies are in PATH
|
||||
wrapProgram $out/bin/pass \
|
||||
--prefix PATH : "${wrapperPath}"
|
||||
'' + stdenv.lib.optionalString dmenuSupport ''
|
||||
'' + lib.optionalString dmenuSupport ''
|
||||
# We just wrap passmenu with the same PATH as pass. It doesn't
|
||||
# need all the tools in there but it doesn't hurt either.
|
||||
wrapProgram $out/bin/passmenu \
|
||||
@@ -127,7 +127,7 @@ stdenv.mkDerivation rec {
|
||||
-e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \
|
||||
-e '/which gpg/ d' \
|
||||
tests/setup.sh
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# 'pass edit' uses hdid, which is not available from the sandbox.
|
||||
rm -f tests/t0200-edit-tests.sh
|
||||
rm -f tests/t0010-generate-tests.sh
|
||||
|
||||
Reference in New Issue
Block a user