From d88ec152cfd6f2a3c6ca74fbef6f5c18a4484f17 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 17 Mar 2023 21:39:18 +0800 Subject: [PATCH] pantheon.elementary-gtk-theme: Backport fixes for epiphany 44 When granite is presented, new version of libadwaita no longer handles the style, this makes epiphany 44 looks very broken. We are likely going to land 44 faster than elementary I think. --- .../artwork/elementary-gtk-theme/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 483bbb0c4956..b6148ee1d674 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, fetchpatch , nix-update-script , gettext , meson @@ -20,6 +21,27 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-KUo9IbB10JRgFrn6I5y4+34PEihuwp78b+YsX2Wqip8="; }; + patches = [ + # All patches listed below are fixes for Epiphany 44. + # https://github.com/elementary/browser/discussions/82 + (fetchpatch { + url = "https://github.com/elementary/stylesheet/commit/c0028159dd5a7767ead9a12e9a4cfb693159c823.patch"; + sha256 = "sha256-JgJ6FoE2aSTmjJ7klAoYXITbxJwy1HFGvr6F6lVQysY="; + }) + (fetchpatch { + url = "https://github.com/elementary/stylesheet/commit/2b9aa7aabce8ab2656340de41f7d5194ddd62078.patch"; + sha256 = "sha256-84sCbVw3JChw25FIKG4eFbj3EkDioefJp5Q938TwXPc="; + }) + (fetchpatch { + url = "https://github.com/elementary/stylesheet/commit/88682d3e931fdd46682d3ac8f1f1e700e2514c56.patch"; + sha256 = "sha256-2/yYO9Upt33bZembRRuvcfwpQunD1hhJ/BC2DZSuWPk="; + }) + (fetchpatch { + url = "https://github.com/elementary/stylesheet/commit/bb15232abc6167a305b4404467498d11901aea69.patch"; + sha256 = "sha256-L6y61CVRTakSHDvFanhbpsSzLkiSp5Dsm0Fg3RKccQk="; + }) + ]; + nativeBuildInputs = [ gettext meson