summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2022-09-07 13:43:43 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-09-17 20:03:29 +0000
commitf38a2fc8ad01ff583c50c8ae19c95e7935ee5ad3 (patch)
treef154c13811bc7f0c1df0547d9a71107fbbad0acf
parentMerge pull request #191657 from NixOS/backport-191364-to-release-22.05 (diff)
downloadnixpkgs-origin/backport-190121-to-release-22.05.tar.gz
mautrix-signal: Use `--prefix` instead of `--set` in wrapper.origin/backport-190121-to-release-22.05
Otherwise, options like `systemd.services.<name>.path` have no effect. An example for this being necessary is to add `ffmpeg` to the path of a service running `mautrix-signal` in order to decode audio messages. In general, package wrappers should not make environment variables like PATH or PYTHONPATH non-overridable. (cherry picked from commit 162d4bf69f2a75369e32d73ce6e0d2d2e9d6b7f5)
-rw-r--r--pkgs/servers/mautrix-signal/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix
index 5d7550fe3cd6..97afa29421e6 100644
--- a/pkgs/servers/mautrix-signal/default.nix
+++ b/pkgs/servers/mautrix-signal/default.nix
@@ -41,8 +41,8 @@ python3.pkgs.buildPythonPackage rec {
" > $out/bin/mautrix-signal
chmod +x $out/bin/mautrix-signal
wrapProgram $out/bin/mautrix-signal \
- --set PATH ${python3}/bin \
- --set PYTHONPATH "$PYTHONPATH"
+ --prefix PATH : "${python3}/bin" \
+ --prefix PYTHONPATH : "$PYTHONPATH"
'';
meta = with lib; {