about summary refs log tree commit diff
path: root/pkgs/sternenseemann
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-06-13 13:16:44 +0200
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-06-13 13:16:44 +0200
commit88f3e07f175c813cd33469e426f76d7815dd1389 (patch)
tree3f736713704ba69bc39e7b05afaa7eb883301a26 /pkgs/sternenseemann
parentc11bd9ec702c71e731cb14c26ff235ea1956a613 (diff)
Revert "Revert "pkgs/sternenseemann/pass: adjust for pass 1.7.4""
This reverts commit c11bd9ec702c71e731cb14c26ff235ea1956a613.
Diffstat (limited to 'pkgs/sternenseemann')
-rw-r--r--pkgs/sternenseemann/default.nix11
1 files changed, 3 insertions, 8 deletions
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}"
     '';
   });