git.iko.soy/typeable/nixpkgs
on master help sign in
pantheon.epiphany: rename patches
commit609928f5a1599b029a12dbf748b01d23ccada5a1 authorBobby Rong <rjl931189261@126.com> dateSun 17 Oct 2021, 11:41 (5 years ago) parentcae2934
3 files changed+7−3
pkgs/desktops/gnome/core/epiphany/default.nix+7−3 pkgs/desktops/gnome/core/epiphany/dark-style.patch → pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch pkgs/desktops/gnome/core/epiphany/navigation-buttons.patch → pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch
pkgs/desktops/gnome/core/epiphany/default.nix+7−3
@@ -47,9 +47,11 @@ stdenv.mkDerivation rec {
4747 };
4848
4949 patches = lib.optionals withPantheon [
50+ # Make this respect dark mode settings from Pantheon
5051 # https://github.com/elementary/browser
51− ./dark-style.patch
52− ./navigation-buttons.patch
52+ # The patch currently differs from upstream (updated for epiphany 40 and 41).
53+ ./pantheon-dark-style.patch
54+ ./pantheon-navigation-buttons.patch
5355 ];
5456
5557 nativeBuildInputs = [
@@ -95,7 +97,9 @@ stdenv.mkDerivation rec {
9597 p11-kit
9698 sqlite
9799 webkitgtk
98− ] ++ lib.optional withPantheon pantheon.granite;
100+ ] ++ lib.optionals withPantheon [
101+ pantheon.granite
102+ ];
99103
100104 # Tests need an X display
101105 mesonFlags = [
pkgs/desktops/gnome/core/epiphany/dark-style.patch → pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patchrenamed

The content is the same.

pkgs/desktops/gnome/core/epiphany/navigation-buttons.patch → pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patchrenamed

The content is the same.