From 1cc9d57471e5a68ce4b63c62b82b4743acbdddfc Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Wed, 23 Jun 2021 12:28:10 +0200
Subject: Revert "sternenseemann/pass: Revert changes for pass 1.7.4"

This reverts commit 8ee2e8ee99e566f007051b9d1b51f6a14eb7b5f0.

pass 1.7.4 is in nixos-unstable now, so these changes are necessary to
fix the build of pass.
---
 pkgs/sternenseemann/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'pkgs/sternenseemann/default.nix')

diff --git a/pkgs/sternenseemann/default.nix b/pkgs/sternenseemann/default.nix
index a54e767d..87410e91 100644
--- a/pkgs/sternenseemann/default.nix
+++ b/pkgs/sternenseemann/default.nix
@@ -114,16 +114,11 @@ lib.fix (self: {
   pass = (pkgs.pass.override {
     waylandSupport = true;
     x11Support = false;
+    dmenuSupport = true;
   }).overrideAttrs (old: {
-    patches = old.patches ++ [ ./patches/passmenu-wayland.patch ];
-    postPatch = ''
-      ${old.postPatch}
+    postPatch = old.postPatch + ''
       substituteInPlace "contrib/dmenu/passmenu" \
-        --replace "bemenu" "'${bins.bemenu} -l10'"
-    '';
-    postInstall = ''
-      ${old.postInstall}
-      cp "contrib/dmenu/passmenu" "$out/bin/"
+        --replace "dmenu-wl" "${bins.bemenu}"
     '';
   });
 
-- 
cgit 1.4.1