commit
6adc2ce335
|
@ -4,7 +4,9 @@
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
{
|
let cfg = config.programs.file-roller;
|
||||||
|
|
||||||
|
in {
|
||||||
|
|
||||||
# Added 2019-08-09
|
# Added 2019-08-09
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -21,6 +23,13 @@ with lib;
|
||||||
|
|
||||||
enable = mkEnableOption "File Roller, an archive manager for GNOME";
|
enable = mkEnableOption "File Roller, an archive manager for GNOME";
|
||||||
|
|
||||||
|
package = mkOption {
|
||||||
|
type = types.package;
|
||||||
|
default = pkgs.gnome.file-roller;
|
||||||
|
defaultText = literalExpression "pkgs.gnome.file-roller";
|
||||||
|
description = "File Roller derivation to use.";
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -28,11 +37,11 @@ with lib;
|
||||||
|
|
||||||
###### implementation
|
###### implementation
|
||||||
|
|
||||||
config = mkIf config.programs.file-roller.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.gnome.file-roller ];
|
environment.systemPackages = [ cfg.package ];
|
||||||
|
|
||||||
services.dbus.packages = [ pkgs.gnome.file-roller ];
|
services.dbus.packages = [ cfg.package ];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -221,6 +221,7 @@ 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.sessionVariables.GTK_CSD = "1";
|
environment.sessionVariables.GTK_CSD = "1";
|
||||||
|
|
|
@ -1,6 +1,30 @@
|
||||||
{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome, gettext, itstool, libxml2, libarchive
|
{ lib
|
||||||
, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales
|
, stdenv
|
||||||
, unzip, cpio }:
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
|
, desktop-file-utils
|
||||||
|
, gettext
|
||||||
|
, glibcLocales
|
||||||
|
, itstool
|
||||||
|
, libxml2
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, pkg-config
|
||||||
|
, python3
|
||||||
|
, wrapGAppsHook
|
||||||
|
, cpio
|
||||||
|
, file
|
||||||
|
, glib
|
||||||
|
, gnome
|
||||||
|
, gtk3
|
||||||
|
, json-glib
|
||||||
|
, libarchive
|
||||||
|
, libnotify
|
||||||
|
, nautilus
|
||||||
|
, pantheon
|
||||||
|
, unzip
|
||||||
|
, withPantheon ? false
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "file-roller";
|
pname = "file-roller";
|
||||||
|
@ -11,11 +35,43 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a";
|
sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
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 = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
|
nativeBuildInputs = [
|
||||||
|
desktop-file-utils
|
||||||
|
gettext
|
||||||
|
glibcLocales
|
||||||
|
itstool
|
||||||
|
libxml2
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
pkg-config
|
||||||
|
python3
|
||||||
|
wrapGAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [ glib gtk3 json-glib libarchive file gnome.adwaita-icon-theme libnotify nautilus cpio ];
|
buildInputs = [
|
||||||
|
cpio
|
||||||
|
file
|
||||||
|
glib
|
||||||
|
gnome.adwaita-icon-theme
|
||||||
|
gtk3
|
||||||
|
json-glib
|
||||||
|
libarchive
|
||||||
|
libnotify
|
||||||
|
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";
|
||||||
|
|
||||||
|
@ -44,6 +100,6 @@ stdenv.mkDerivation rec {
|
||||||
description = "Archive manager for the GNOME desktop environment";
|
description = "Archive manager for the GNOME desktop environment";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = teams.gnome.members;
|
maintainers = teams.gnome.members ++ teams.pantheon.members;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,6 +73,8 @@ 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
|
||||||
|
|
Loading…
Reference in New Issue