diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-08 18:00:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-08 18:00:53 +0000 |
| commit | 5f3708016ca0ef547d3fb79a521e9d5bad15d454 (patch) | |
| tree | c2e70dd0d246f0a5f493757b0b5fd79f181705ea /pkgs/desktops | |
| parent | 367355c96657f81fcedc3cd86d4657b29fab089e (diff) | |
| parent | 869d88db9b1aee20665260a4964f558bec91018a (diff) | |
| download | nixlib-5f3708016ca0ef547d3fb79a521e9d5bad15d454.tar nixlib-5f3708016ca0ef547d3fb79a521e9d5bad15d454.tar.gz nixlib-5f3708016ca0ef547d3fb79a521e9d5bad15d454.tar.bz2 nixlib-5f3708016ca0ef547d3fb79a521e9d5bad15d454.tar.lz nixlib-5f3708016ca0ef547d3fb79a521e9d5bad15d454.tar.xz nixlib-5f3708016ca0ef547d3fb79a521e9d5bad15d454.tar.zst nixlib-5f3708016ca0ef547d3fb79a521e9d5bad15d454.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
3 files changed, 9 insertions, 21 deletions
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') diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 01902209c415..7356d6342c4d 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "deepin-terminal"; - version = "6.0.8"; + version = "6.0.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-7Yyw4aw+44JX9SKuwmJSrLz04WETvs3E3cnt0/O+Ls0="; + hash = "sha256-QdODR4zmbMuzSVy6eJhwJHNPXkAn6oCLHq+YZEOmtIU="; }; cmakeFlags = [ "-DVERSION=${version}" ]; |