69698ec11c
* gnome3: only maintain single GNOME 3 package set GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources to update a single version of GNOME. Maintaining multiple versions just does not make sense. Additionally, it makes viewing history using most Git tools bothersome. This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes the config variable for choosing packageset (`environment.gnome3.packageSet`), updates the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`. Closes: #29329 * maintainers/scripts/gnome: Use fixed GNOME 3 directory Since we now allow only a single GNOME 3 package set, specifying the working directory is not necessary. This commit sets the directory to `pkgs/desktops/gnome-3`.
124 lines
5.3 KiB
Diff
124 lines
5.3 KiB
Diff
From ac9e8e835888da1faa57f07c54fa4e73783621e2 Mon Sep 17 00:00:00 2001
|
|
From: Jascha Geerds <jascha@jgeerds.name>
|
|
Date: Sun, 25 Jun 2017 11:32:30 +0100
|
|
Subject: [PATCH 1/3] Search for themes and icons in system data dirs
|
|
|
|
---
|
|
gtweak/tweaks/tweak_group_interface.py | 17 ++++-------------
|
|
gtweak/tweaks/tweak_group_keymouse.py | 7 ++-----
|
|
gtweak/utils.py | 17 +++++++++++++++++
|
|
3 files changed, 23 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
|
|
index 97751ed..db89b85 100644
|
|
--- a/gtweak/tweaks/tweak_group_interface.py
|
|
+++ b/gtweak/tweaks/tweak_group_interface.py
|
|
@@ -26,7 +26,7 @@ from gi.repository import Gtk
|
|
from gi.repository import GLib
|
|
|
|
import gtweak
|
|
-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file
|
|
+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
|
|
from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
|
|
from gtweak.gshellwrapper import GnomeShellFactory
|
|
from gtweak.gsettings import GSettingsSetting
|
|
@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
|
|
if gtk_ver % 2: # Want even number
|
|
gtk_ver += 1
|
|
|
|
- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
|
|
- os.path.join(GLib.get_user_data_dir(), "themes"),
|
|
- os.path.join(os.path.expanduser("~"), ".themes"))
|
|
- valid = walk_directories(dirs, lambda d:
|
|
+ valid = walk_directories(get_resource_dirs("themes"), lambda d:
|
|
os.path.exists(os.path.join(d, "gtk-2.0")) and \
|
|
(os.path.exists(os.path.join(d, "gtk-3.0")) or \
|
|
os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
|
|
@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
|
|
**options)
|
|
|
|
def _get_valid_icon_themes(self):
|
|
- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
|
|
- os.path.join(GLib.get_user_data_dir(), "icons"),
|
|
- os.path.join(os.path.expanduser("~"), ".icons"))
|
|
- valid = walk_directories(dirs, lambda d:
|
|
+ valid = walk_directories(get_resource_dirs("icons"), lambda d:
|
|
os.path.isdir(d) and \
|
|
os.path.exists(os.path.join(d, "index.theme")))
|
|
return valid
|
|
@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
|
|
**options)
|
|
|
|
def _get_valid_cursor_themes(self):
|
|
- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
|
|
- os.path.join(GLib.get_user_data_dir(), "icons"),
|
|
- os.path.join(os.path.expanduser("~"), ".icons"))
|
|
- valid = walk_directories(dirs, lambda d:
|
|
+ valid = walk_directories(get_resource_dirs("icons"), lambda d:
|
|
os.path.isdir(d) and \
|
|
os.path.exists(os.path.join(d, "cursors")))
|
|
return valid
|
|
diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
|
|
index 69c4b7e..b06900c 100644
|
|
--- a/gtweak/tweaks/tweak_group_keymouse.py
|
|
+++ b/gtweak/tweaks/tweak_group_keymouse.py
|
|
@@ -21,7 +21,7 @@ from gi.repository import GLib
|
|
|
|
import gtweak
|
|
from gtweak.gshellwrapper import GnomeShellFactory
|
|
-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default
|
|
+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
|
|
from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
|
|
|
|
_shell = GnomeShellFactory().get_shell()
|
|
@@ -41,10 +41,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
|
|
**options)
|
|
|
|
def _get_valid_key_themes(self):
|
|
- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
|
|
- os.path.join(GLib.get_user_data_dir(), "themes"),
|
|
- os.path.join(os.path.expanduser("~"), ".themes"))
|
|
- valid = walk_directories(dirs, lambda d:
|
|
+ valid = walk_directories(get_resource_dirs("themes"), lambda d:
|
|
os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
|
|
os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
|
|
return valid
|
|
diff --git a/gtweak/utils.py b/gtweak/utils.py
|
|
index 39f8833..b0993b6 100644
|
|
--- a/gtweak/utils.py
|
|
+++ b/gtweak/utils.py
|
|
@@ -21,6 +21,7 @@ import tempfile
|
|
import shutil
|
|
import subprocess
|
|
import glob
|
|
+import itertools
|
|
|
|
import gtweak
|
|
from gtweak.gsettings import GSettingsSetting
|
|
@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True):
|
|
stdout, stderr = p.communicate()
|
|
return stdout, stderr, p.returncode
|
|
|
|
+def get_resource_dirs(resource):
|
|
+ """Returns a list of all known resource dirs for a given resource.
|
|
+
|
|
+ :param str resource:
|
|
+ Name of the resource (e.g. "themes")
|
|
+ :return:
|
|
+ A list of resource dirs
|
|
+ """
|
|
+ dirs = [os.path.join(dir, resource)
|
|
+ for dir in itertools.chain(GLib.get_system_data_dirs(),
|
|
+ (gtweak.DATA_DIR,
|
|
+ GLib.get_user_data_dir()))]
|
|
+ dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))]
|
|
+
|
|
+ return [dir for dir in dirs if os.path.isdir(dir)]
|
|
+
|
|
@singleton
|
|
class AutostartManager:
|
|
|
|
--
|
|
2.12.2
|
|
|