diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 1690a9336474..f3bc244eba00 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , meson , ninja @@ -38,8 +39,12 @@ stdenv.mkDerivation rec { }; patches = [ - # See https://github.com/linuxmint/cinnamon-screensaver/issues/446#issuecomment-1819580053 - ./fix-broken-theming-with-pygobject-3-46.patch + # Fix broken theming with pygobject >= 3.46.0 + # https://github.com/linuxmint/cinnamon-screensaver/issues/446 + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon-screensaver/commit/37ab8ed18f35591f2bd99043f12c06d98b4527db.patch"; + hash = "sha256-4YSithosyTLy8OFu6DEhLT4c+EGEg84EenTKAiBiWo4="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/fix-broken-theming-with-pygobject-3-46.patch b/pkgs/desktops/cinnamon/cinnamon-screensaver/fix-broken-theming-with-pygobject-3-46.patch deleted file mode 100644 index c594826d5261..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/fix-broken-theming-with-pygobject-3-46.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/cinnamon-screensaver-main.py b/src/cinnamon-screensaver-main.py -index 05b727c..a185159 100755 ---- a/src/cinnamon-screensaver-main.py -+++ b/src/cinnamon-screensaver-main.py -@@ -139,9 +139,9 @@ class Main(Gtk.Application): - - fallback_prov = Gtk.CssProvider() - -- if fallback_prov.load_from_data(fallback_css.encode()): -- Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default(), fallback_prov, 600) -- Gtk.StyleContext.reset_widgets(Gdk.Screen.get_default()) -+ fallback_prov.load_from_data(fallback_css.encode()) -+ Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default(), fallback_prov, 600) -+ Gtk.StyleContext.reset_widgets(Gdk.Screen.get_default()) - - if __name__ == "__main__": - setproctitle.setproctitle('cinnamon-screensaver')