nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

pantheon.file-roller: drop

Browse Source 
The vanilla file-roller already support dark style
preference in Pantheon, so no need to keep the package.
This commit is contained in:
Bobby Rong 2022-03-12 19:23:50 +08:00 committed by Jan Tojnar
parent a8d19cdbdf
commit 0f97d73b74
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -222,7 +222,6 @@ in
programs.evince.enable = mkDefault true;
programs.evince.package = pkgs.pantheon.evince;
programs.file-roller.enable = mkDefault true;
programs.file-roller.package = pkgs.pantheon.file-roller;
# Settings from elementary-default-settings
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";

14
pkgs/desktops/gnome/apps/file-roller/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, desktop-file-utils
, gettext
, glibcLocales
@ -22,9 +21,7 @@
, libarchive
, libnotify
, nautilus
, pantheon
, unzip
, withPantheon ? false
}:
stdenv.mkDerivation rec {
@ -36,15 +33,6 @@ stdenv.mkDerivation rec {
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
nativeBuildInputs = [
@ -71,8 +59,6 @@ stdenv.mkDerivation rec {
libarchive
libnotify
nautilus
] ++ lib.optionals withPantheon [
pantheon.granite
];
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";

4
pkgs/desktops/pantheon/default.nix
View File

@ -85,8 +85,6 @@ lib.makeScope pkgs.newScope (self: with self; {
evince = pkgs.evince.override { withPantheon = true; };
file-roller = pkgs.gnome.file-roller.override { withPantheon = true; };
sideload = callPackage ./apps/sideload { };
#### 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
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
}