pantheon.file-roller: drop
The vanilla file-roller already support dark style preference in Pantheon, so no need to keep the package.
This commit is contained in:
parent
a8d19cdbdf
commit
0f97d73b74
|
@ -222,7 +222,6 @@ in
|
||||||
programs.evince.enable = mkDefault true;
|
programs.evince.enable = mkDefault true;
|
||||||
programs.evince.package = pkgs.pantheon.evince;
|
programs.evince.package = pkgs.pantheon.evince;
|
||||||
programs.file-roller.enable = mkDefault true;
|
programs.file-roller.enable = mkDefault true;
|
||||||
programs.file-roller.package = pkgs.pantheon.file-roller;
|
|
||||||
|
|
||||||
# Settings from elementary-default-settings
|
# Settings from elementary-default-settings
|
||||||
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
|
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, fetchpatch
|
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
, gettext
|
, gettext
|
||||||
, glibcLocales
|
, glibcLocales
|
||||||
|
@ -22,9 +21,7 @@
|
||||||
, libarchive
|
, libarchive
|
||||||
, libnotify
|
, libnotify
|
||||||
, nautilus
|
, nautilus
|
||||||
, pantheon
|
|
||||||
, unzip
|
, unzip
|
||||||
, withPantheon ? false
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -36,15 +33,6 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "Bi5rSO1re8o9ONAoY9apsBP0zNNbpvvjXFaYeQDf7Ok=";
|
sha256 = "Bi5rSO1re8o9ONAoY9apsBP0zNNbpvvjXFaYeQDf7Ok=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optionals withPantheon [
|
|
||||||
# Make this respect dark mode settings from Pantheon
|
|
||||||
# https://github.com/elementary/fileroller/
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://raw.githubusercontent.com/elementary/fileroller/f183eac36c68c9c9441e72294d4e305cf5fe36ed/fr-application-prefers-color-scheme.patch";
|
|
||||||
sha256 = "sha256-d/sqf4Oen9UrzYqru7Ck15o/6g6WfxRDH/iAGFXgYAA=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
LANG = "en_US.UTF-8"; # postinstall.py
|
LANG = "en_US.UTF-8"; # postinstall.py
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -71,8 +59,6 @@ stdenv.mkDerivation rec {
|
||||||
libarchive
|
libarchive
|
||||||
libnotify
|
libnotify
|
||||||
nautilus
|
nautilus
|
||||||
] ++ lib.optionals withPantheon [
|
|
||||||
pantheon.granite
|
|
||||||
];
|
];
|
||||||
|
|
||||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
|
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
|
||||||
|
|
|
@ -85,8 +85,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
|
|
||||||
evince = pkgs.evince.override { withPantheon = true; };
|
evince = pkgs.evince.override { withPantheon = true; };
|
||||||
|
|
||||||
file-roller = pkgs.gnome.file-roller.override { withPantheon = true; };
|
|
||||||
|
|
||||||
sideload = callPackage ./apps/sideload { };
|
sideload = callPackage ./apps/sideload { };
|
||||||
|
|
||||||
#### DESKTOP
|
#### DESKTOP
|
||||||
|
@ -244,6 +242,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
|
|
||||||
extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01
|
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
|
||||||
|
|
||||||
notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18
|
notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue