From 4ce47ce0c38cf76fb953d641569989fcd698b548 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Fri, 29 Aug 2025 19:48:52 -0400 Subject: [PATCH] openscad: fix application icon (cherry picked from commit 45d2d5f8d61127deaa771f1e88ba28372e8ddbb7) --- pkgs/applications/graphics/openscad/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 1609c8b42565..6ca8d79b0f9b 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -74,6 +74,16 @@ stdenv.mkDerivation rec { url = "https://github.com/openscad/openscad/commit/cc49ad8dac24309f5452d5dea9abd406615a52d9.patch"; hash = "sha256-B3i+o6lR5osRcVXTimDZUFQmm12JhmbFgG9UwOPebF4="; }) + (fetchpatch { + name = "fix-application-icon-not-shown-on-wayland.patch"; + url = "https://github.com/openscad/openscad/commit/5ea83e5117f5f3ac2197c63db69f523721b8fa85.patch"; + hash = "sha256-nfeUv0R+J95fyqnVC0HNeBVZnxVoisY1pcdII82qUSU="; + + # upstream's formatting conventions changed between 2021 and this patch + postFetch = '' + sed -i 's/& / \&/g;s/\*\*/\0 /g;s/^\(.\) /\1\t/' "$out" + ''; + }) ]; postPatch = ''