From b5526585c2de2e66c9111a5484dee65806acbcf5 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 11 Jul 2022 18:23:52 -0500 Subject: treewide: inject xdg-open into wrappers as $PATH suffix The xdg-open utility is only ever a runtime dependency and its dependents only expect that it accept a URI as a command line argument and do something with it that the user would expect. For such as a trivial relationship it should be possible for users to override xdg-open with something else in their PATH. --- pkgs/tools/bluetooth/blueman/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/bluetooth') diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 45f5e5ce0b6..1aa668d86f4 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -5,7 +5,6 @@ let pythonPackages = python3Packages; - binPath = lib.makeBinPath [ xdg-utils dnsmasq dhcp iproute2 ]; in stdenv.mkDerivation rec { pname = "blueman"; @@ -41,8 +40,12 @@ in stdenv.mkDerivation rec { (lib.enableFeature withPulseAudio "pulseaudio") ]; + makeWrapperArgs = [ + "--prefix PATH ':' ${lib.makeBinPath [ dnsmasq dhcp iproute2 ]}" + "--suffix PATH ':' ${lib.makeBinPath [ xdg-utils ]}" + ]; + postFixup = '' - makeWrapperArgs="--prefix PATH ':' ${binPath}" # This mimics ../../../development/interpreters/python/wrap.sh wrapPythonProgramsIn "$out/bin" "$out $pythonPath" wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" -- cgit 1.4.1