diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-06-23 12:28:10 +0200 |
---|---|---|
committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-06-23 12:28:10 +0200 |
commit | 1cc9d57471e5a68ce4b63c62b82b4743acbdddfc (patch) | |
tree | ef5e8c162c5a0b41f7d0482071b65eed854dda94 /pkgs/sternenseemann | |
parent | 6dd400e840cbfa02ee7c56560bb0c055eacc47ea (diff) |
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.
Diffstat (limited to 'pkgs/sternenseemann')
-rw-r--r-- | pkgs/sternenseemann/default.nix | 11 |
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}" ''; }); |