summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-09-09 22:40:33 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2020-09-09 22:47:23 +0200
commit1186c168892b0a406374221cebe74595c1a2528d (patch)
treecfc74881565514595f16f20bb8e14754dd469251
parentMerge pull request #97578 from makefu/pkgs/pyhaversion/fix (diff)
downloadnixpkgs-1186c168892b0a406374221cebe74595c1a2528d.tar.gz
pass-wayland: use proper derivation for `.withExtensions`
The `pass.withExtensions`-function uses `buildEnv` to create a derivation which contains a `pass`-package and a list of extensions for it. However, this function always uses the `pass`-attribute for `buildEnv` which will break e.g. `passmenu` or `pass show -c` on desktops using Wayland (and `pass-wayland.withExtensions`) since the default `pass`-package without support for Wayland's clipboard is used. This patch replaces the `pass`-attribute in the derivation with `pass-wayland` to work around this issue.
-rw-r--r--pkgs/top-level/all-packages.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fff6dd98b460..a34dadf63995 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1113,6 +1113,7 @@ in
pass-wayland = callPackage ../tools/security/pass {
waylandSupport = true;
+ pass = pass-wayland;
};
passExtensions = recurseIntoAttrs pass.extensions;