From 7df8ba4012d0be57d8a4397ac4b1dd6f818e7023 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 8 Sep 2021 05:26:05 +0300 Subject: [PATCH] ulauncher: patchShebangs and do not double wrap --- pkgs/applications/misc/ulauncher/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index f9bf70b661ce..0b7a766ba39d 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -77,6 +77,9 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py --subst-var out + patchShebangs bin/ulauncher-toggle + substituteInPlace bin/ulauncher-toggle \ + --replace wmctrl ${wmctrl}/bin/wmctrl ''; # https://github.com/Ulauncher/Ulauncher/issues/390 @@ -99,8 +102,10 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; + # do not double wrap + dontWrapGApps = true; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ wmctrl ]}") + makeWrapperArgs+=("''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}") ''; passthru = {