From 27cf4a4e23d6e5345251c332eebe158ee7134307 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 8 Feb 2025 21:22:55 +0800 Subject: [PATCH] cinnamon-common: Patch {cancel-print-dialog,lpstat-a}.py For issue 380117. Note that lpstat-a.py does not need to be wrapped. --- pkgs/by-name/ci/cinnamon-common/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index 09ddfca9743a..2071383b3d72 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon-common/package.nix @@ -171,6 +171,10 @@ stdenv.mkDerivation rec { substituteInPlace ./modules/cs_user.py --replace-fail "/usr/bin/passwd" "/run/wrappers/bin/passwd" popd + # In preFixup we make these executable. + substituteInPlace ./files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js \ + --replace-fail "Util.spawn_async(['python3'," "Util.spawn_async([" + substituteInPlace ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} \ --replace-fail "exec cinnamon-session" "exec ${cinnamon-session}/bin/cinnamon-session" @@ -198,6 +202,10 @@ stdenv.mkDerivation rec { # Called as `pkexec cinnamon-settings-users.py`. wrapGApp $out/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py + + # postPatch touches both but we mainly want to wrap cancel-print-dialog. + chmod +x $out/share/cinnamon/applets/printers@cinnamon.org/{cancel-print-dialog,lpstat-a}.py + wrapGApp $out/share/cinnamon/applets/printers@cinnamon.org/cancel-print-dialog.py ''; passthru = {