From c11bd9ec702c71e731cb14c26ff235ea1956a613 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 13 Jun 2021 13:16:21 +0200
Subject: Revert "pkgs/sternenseemann/pass: adjust for pass 1.7.4"

This reverts commit 1987f2d9a4b185dfa319763a67d527fd7ade4d83.

This is not even merged into master yet, pushed by mistake.
---
 pkgs/sternenseemann/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'pkgs/sternenseemann')

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