JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pantheon.elementary-greeter: hardcode elementary theme

Browse Source 
For some reason correcting the path to the settings daemon
causes the icons to not be the elementary one's.

Hardcoding this fixes this very simply without
the need for the complicated wrapping.
This commit is contained in:
worldofpeace 2019-04-05 02:30:01 -04:00
parent c2ac422d40
commit 536c72a62b
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
View File

@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
inherit numlockx;
})
./01-sysconfdir-install.patch
./hardcode-theme.patch
];
mesonFlags = [
@ -70,9 +71,6 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
# GTK+ reads default settings (such as icons and themes) from elementary's settings.ini here
--prefix XDG_CONFIG_DIRS : "${elementary-default-settings}/etc"
# dbus-launch needed in path
--prefix PATH : "${dbus}/bin"

15
pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala
index 11aa4c0..daf4a8a 100644
--- a/src/PantheonGreeter.vala
+++ b/src/PantheonGreeter.vala
@@ -474,6 +474,10 @@ public static int main (string [] args) {
Gdk.CursorType.LEFT_PTR);
Gdk.get_default_root_window ().set_cursor (cursor);
+ var settings = Gtk.Settings.get_default ();
+ settings.gtk_icon_theme_name = "elementary";
+ settings.gtk_theme_name = "elementary";
+
var icon_theme = Gtk.IconTheme.get_default ();
icon_theme.add_resource_path ("/io/elementary/greeter/icons");