From 8ee2e8ee99e566f007051b9d1b51f6a14eb7b5f0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 16 Jun 2021 02:16:32 +0200
Subject: sternenseemann/pass: Revert changes for pass 1.7.4

This reverts commit 88f3e07f175c813cd33469e426f76d7815dd1389.

Since https://github.com/NixOS/nixpkgs/pull/126616 still isn't merged
and also not in the current NixOS unstable channel, we run into the
following evaluation error:

  assertion '(dmenuSupport -> (((dmenu != null) && (xdotool != null)) && x11Support))'
  failed at: (17:1) in file: .../pkgs/tools/security/pass/default.nix

I decided to re-revert this change, because the commit in question
(which undid the revert) did not specify a good reason for doing so and
right now the eval error breaks all machine channels on Hydra.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @sternenseemann
---
 pkgs/sternenseemann/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'pkgs')

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