diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/security/pass/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/security/pass/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/tools/security/pass/default.nix b/nixpkgs/pkgs/tools/security/pass/default.nix index 7d214f1649a3..498e715a8ebf 100644 --- a/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/nixpkgs/pkgs/tools/security/pass/default.nix @@ -11,8 +11,6 @@ , tombPluginSupport ? false }: -with lib; - assert x11Support -> xclip != null; assert waylandSupport -> wl-clipboard != null; @@ -31,9 +29,11 @@ let selected = [ pass ] ++ extensions passExtensions ++ lib.optional tombPluginSupport passExtensions.tomb; in buildEnv { - name = "pass-extensions-env"; + # lib.getExe looks for name, so we keep it the same as mainProgram + name = "pass"; paths = selected; - buildInputs = [ makeWrapper ] ++ concatMap (x: x.buildInputs) selected; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.concatMap (x: x.buildInputs) selected; postBuild = '' files=$(find $out/bin/ -type f -exec readlink -f {} \;) @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { # dependencies (s.el) here. The user has to do this themselves. mkdir -p "$out/share/emacs/site-lisp" cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - '' + optionalString dmenuSupport '' + '' + lib.optionalString dmenuSupport '' cp "contrib/dmenu/passmenu" "$out/bin/" ''; @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = true; - installCheckInputs = [ git ]; + nativeInstallCheckInputs = [ git ]; installCheckTarget = "test"; passthru = { @@ -155,6 +155,7 @@ stdenv.mkDerivation rec { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://www.passwordstore.org/"; license = licenses.gpl2Plus; + mainProgram = "pass"; maintainers = with maintainers; [ lovek323 fpletz tadfisher globin ma27 ]; platforms = platforms.unix; |