mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
pantheon.evince: drop
The vanilla evince already support dark style preference in Pantheon, so no need to keep the patch.
This commit is contained in:
parent
5b6b29248a
commit
b214aa70b4
@ -220,7 +220,6 @@ in
|
||||
] config.environment.pantheon.excludePackages);
|
||||
|
||||
programs.evince.enable = mkDefault true;
|
||||
programs.evince.package = pkgs.pantheon.evince;
|
||||
programs.file-roller.enable = mkDefault true;
|
||||
|
||||
# Settings from elementary-default-settings
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -32,7 +31,6 @@
|
||||
, gsettings-desktop-schemas
|
||||
, gnome-desktop
|
||||
, dbus
|
||||
, pantheon
|
||||
, python3
|
||||
, texlive
|
||||
, gst_all_1
|
||||
@ -40,7 +38,6 @@
|
||||
, supportMultimedia ? true # PDF multimedia
|
||||
, libgxps
|
||||
, supportXPS ? true # Open XML Paper Specification via libgxps
|
||||
, withPantheon ? false
|
||||
, withLibsecret ? true
|
||||
}:
|
||||
|
||||
@ -55,16 +52,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "rGD/FKr1bWQ5lcO0um9XJcyc4k4nkIc7XIfttKIALUI=";
|
||||
};
|
||||
|
||||
patches = lib.optionals withPantheon [
|
||||
# Make this respect dark mode settings from Pantheon
|
||||
# https://github.com/elementary/evince/pull/21
|
||||
# https://github.com/elementary/evince/pull/31
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/elementary/evince/c8364019ee2c2dffd2a1bccf79b8f4e526aa22af/dark-style.patch";
|
||||
sha256 = "sha256-nKELRXnM6gMRTGmWdO1Qqlo9ciy+4HOK5z2CYOoi2Lo=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
@ -115,9 +102,7 @@ stdenv.mkDerivation rec {
|
||||
gst-plugins-bad
|
||||
gst-plugins-ugly
|
||||
gst-libav
|
||||
]) ++ lib.optionals withPantheon [
|
||||
pantheon.granite
|
||||
];
|
||||
]);
|
||||
|
||||
mesonFlags = [
|
||||
"-Dnautilus=false"
|
||||
|
@ -83,8 +83,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
epiphany = pkgs.epiphany.override { withPantheon = true; };
|
||||
|
||||
evince = pkgs.evince.override { withPantheon = true; };
|
||||
|
||||
sideload = callPackage ./apps/sideload { };
|
||||
|
||||
#### DESKTOP
|
||||
@ -240,6 +238,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21
|
||||
|
||||
evince = pkgs.gnome.evince; # added 2022-03-18
|
||||
|
||||
extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01
|
||||
|
||||
file-roller = pkgs.gnome.file-roller; # added 2022-03-12
|
||||
|
Loading…
Reference in New Issue
Block a user