From 14120a423b974dc5c7672e6b38d2f24c7163749d Mon Sep 17 00:00:00 2001 From: 8573 <8573@users.noreply.github.com> Date: Sun, 14 Aug 2016 11:38:25 +0000 Subject: dmenu: Fix scripts to run commands by store paths (#17709) The `dmenu` package includes two binary programs, `dmenu` and `stest`, and two shell scripts, `dmenu_run` and `dmenu_path`. `dmenu_run` invokes `dmenu` and `dmenu_path`, and `dmenu_path` invokes `stest`. `dmenu_run`'s invocation of `dmenu` was patched to run it by its full store path, but its invocation of `dmenu_path` and `dmenu_path`'s invocation of `stest` were not. If `dmenu_path` and `stest` were not in the set of system packages or otherwise in the `PATH`, this situation would result in `dmenu_run` opening a dmenu instance with no menu entries (which would normally be generated by `dmenu_path`, which `dmenu_run` couldn't find, as it was running it by `PATH` lookup). This commit fixes the package to also patch the invocation of `dmenu_path` in `dmenu_run` and the invocations of `stest` in `dmenu_path` to invoke those programs by their full store paths. I have tested this change on NixOS. --- pkgs/applications/misc/dmenu/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/misc') diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index b0879599833b6..1dc9fe5e2026e 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { inherit patches; postPatch = '' - sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run + sed -ri -e 's!\<(dmenu|dmenu_path|stest)\>!'"$out/bin"'/&!g' dmenu_run + sed -ri -e 's!\!'"$out/bin"'/&!g' dmenu_path ''; preConfigure = '' -- cgit 1.4.1