git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68729 from worldofpeace/elementary-greeter/master

nixos/pantheon: use Pantheon's greeter

commit760b677c19ba6b1e6988e72c912270a561516939 authorworldofpeace <worldofpeace@protonmail.ch> dateWed 18 Sep 2019, 11:16 (7 years ago) parentee29fbd5e936ca
9 files changed+72−102
nixos/modules/services/x11/desktop-managers/pantheon.nix+8−8 nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix+1−13 pkgs/desktops/pantheon/default.nix+1−3 pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix+52−31 pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch−13 pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch−15 pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch−13 pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch → pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patch+6−6 pkgs/desktops/pantheon/desktop/wingpanel/default.nix+4
nixos/modules/services/x11/desktop-managers/pantheon.nix+8−8
@@ -79,8 +79,7 @@ in
7979 Using Pantheon without LightDM as a displayManager will break screenlocking from the UI.
8080 '';
8181
82− services.xserver.displayManager.lightdm.enable = mkDefault true;
83− services.xserver.displayManager.lightdm.greeters.gtk.enable = mkDefault true;
82+ services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
8483
8584 # If not set manually Pantheon session cannot be started
8685 # Known issue of https://github.com/NixOS/nixpkgs/pull/43992
@@ -98,10 +97,6 @@ in
9897 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
9998 fi
10099 '') cfg.sessionPath}
101−
102− # Settings from elementary-default-settings
103− export GTK_CSD=1
104− export GTK_MODULES=$GTK_MODULES:pantheon-filechooser-module
105100 fi
106101 '';
107102
@@ -166,9 +161,14 @@ in
166161 networkmanager-iodine networkmanager-l2tp; };
167162
168163 # Override GSettings schemas
169− environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
164+ environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
165+
166+ environment.sessionVariables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";
170167
171− environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";
168+ # Settings from elementary-default-settings
169+ environment.sessionVariables.GTK_CSD = "1";
170+ environment.sessionVariables.GTK_MODULES = "pantheon-filechooser-module";
171+ environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
172172
173173 environment.pathsToLink = [
174174 # FIXME: modules should link subdirs of `/share` rather than relying on this
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix+1−13
@@ -8,11 +8,6 @@ let
88 ldmcfg = dmcfg.lightdm;
99 cfg = ldmcfg.greeters.pantheon;
1010
11− xgreeters = pkgs.linkFarm "pantheon-greeter-xgreeters" [{
12− path = "${pkgs.pantheon.elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
13− name = "io.elementary.greeter.desktop";
14− }];
15−
1611in
1712{
1813 options = {
@@ -33,17 +28,10 @@ in
3328
3429 config = mkIf (ldmcfg.enable && cfg.enable) {
3530
36− warnings = [
37− ''
38− The Pantheon greeter is suboptimal in NixOS and can possibly put you in
39− a situation where you cannot start a session when switching desktopManagers.
40− ''
41− ];
42−
4331 services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
4432
4533 services.xserver.displayManager.lightdm.greeter = mkDefault {
46− package = xgreeters;
34+ package = pkgs.pantheon.elementary-greeter.xgreeters;
4735 name = "io.elementary.greeter";
4836 };
4937
pkgs/desktops/pantheon/default.nix+1−3
@@ -90,9 +90,7 @@ lib.makeScope pkgs.newScope (self: with self; {
9090
9191 elementary-default-settings = callPackage ./desktop/elementary-default-settings { };
9292
93− elementary-greeter = callPackage ./desktop/elementary-greeter {
94− inherit (gnome3) gnome-desktop;
95− };
93+ elementary-greeter = callPackage ./desktop/elementary-greeter { };
9694
9795 elementary-print-shim = callPackage ./desktop/elementary-print-shim { };
9896
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix+52−31
@@ -1,20 +1,41 @@
1−{ stdenv, fetchFromGitHub, pantheon, pkgconfig, substituteAll, meson
2−, ninja, vala, desktop-file-utils, gtk3, granite, libgee, elementary-settings-daemon
3−, gnome-desktop, mutter, elementary-icon-theme, wingpanel-with-indicators
4−, elementary-gtk-theme, nixos-artwork, lightdm, numlockx
5−, clutter-gtk, libGL, dbus, wrapGAppsHook }:
1+{ stdenv
2+, fetchFromGitHub
3+, linkFarm
4+, elementary-greeter
5+, pantheon
6+, pkgconfig
7+, meson
8+, ninja
9+, vala
10+, desktop-file-utils
11+, gtk3
12+, granite
13+, libgee
14+, elementary-settings-daemon
15+, mutter
16+, elementary-icon-theme
17+, wingpanel-with-indicators
18+, elementary-gtk-theme
19+, nixos-artwork
20+, lightdm
21+, gdk-pixbuf
22+, clutter-gtk
23+, dbus
24+, accountsservice
25+, wrapGAppsHook
26+}:
627
728stdenv.mkDerivation rec {
829 pname = "elementary-greeter";
9− version = "3.3.1";
30+ version = "unstable-2019-09-10";
1031
1132 repoName = "greeter";
1233
1334 src = fetchFromGitHub {
1435 owner = "elementary";
1536 repo = repoName;
16− rev = version;
17− sha256 = "1vkq4z0hrmvzv4sh2qkxjajdxcycd1zj97a3pc8n4yb858pqfyzc";
37+ rev = "cad7d28d2b40ed04f6ce49ab44408297b5c69468";
38+ sha256 = "0m8iq04wdwgg6arm7dzwi7a0snxvss62zpnw2knpr6lp77vd7hqr";
1839 };
1940
2041 passthru = {
@@ -22,6 +43,11 @@ stdenv.mkDerivation rec {
2243 inherit repoName;
2344 attrPath = pname;
2445 };
46+
47+ xgreeters = linkFarm "pantheon-greeter-xgreeters" [{
48+ path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
49+ name = "io.elementary.greeter.desktop";
50+ }];
2551 };
2652
2753 nativeBuildInputs = [
@@ -34,38 +60,32 @@ stdenv.mkDerivation rec {
3460 ];
3561
3662 buildInputs = [
37− clutter-gtk
38− elementary-icon-theme
63+ accountsservice
64+ clutter-gtk # else we get could not generate cargs for mutter-clutter-2
3965 elementary-gtk-theme
66+ elementary-icon-theme
4067 elementary-settings-daemon
41− gnome-desktop
68+ gdk-pixbuf
4269 granite
4370 gtk3
4471 libgee
45− libGL
4672 lightdm
4773 mutter
4874 wingpanel-with-indicators
4975 ];
5076
51− patches = [
52− (substituteAll {
53− src = ./gsd.patch;
54− elementary_settings_daemon = "${elementary-settings-daemon}/libexec/";
55− })
56− (substituteAll {
57− src = ./numlockx.patch;
58− inherit numlockx;
59− })
60− ./01-sysconfdir-install.patch
61− ./hardcode-theme.patch
62− ];
63−
6477 mesonFlags = [
6578 # A hook does this but after wrapGAppsHook so the files never get wrapped.
6679 "--sbindir=${placeholder "out"}/bin"
6780 # baked into the program for discovery of the greeter configuration
6881 "--sysconfdir=/etc"
82+ # We use the patched gnome-settings-daemon
83+ "-Dubuntu-patched-gsd=true"
84+ "-Dgsd-dir=${elementary-settings-daemon}/libexec/" # trailing slash is needed
85+ ];
86+
87+ patches = [
88+ ./sysconfdir-install.patch
6989 ];
7090
7191 preFixup = ''
@@ -76,18 +96,19 @@ stdenv.mkDerivation rec {
7696 # for `wingpanel -g`
7797 --prefix PATH : "${wingpanel-with-indicators}/bin"
7898
79− # TODO: they should be using meson for this
80− # See: https://github.com/elementary/greeter/blob/19c0730fded4e9ddec5a491f0e78f83c7c04eb59/src/PantheonGreeter.vala#L451
99+ # for the compositor
81100 --prefix PATH : "$out/bin"
82101 )
83102 '';
84103
85104 postFixup = ''
86− substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \
87− --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter"
88−
105+ # Use NixOS default wallpaper
89106 substituteInPlace $out/etc/lightdm/io.elementary.greeter.conf \
90− --replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png"
107+ --replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" \
108+ "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png"
109+
110+ substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \
111+ --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter"
91112 '';
92113
93114 meta = with stdenv.lib; {
pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/src/meson.build b/src/meson.build
2−index 2450c1a..a908d11 100644
3−--- a/src/meson.build
4−+++ b/src/meson.build
5−@@ -1,7 +1,7 @@
6− conf_data = configuration_data()
7− conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm'))
8− conf_data.set('GETTEXT_PACKAGE', meson.project_name())
9−-conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/')
10−+conf_data.set('GSD_DIR', '@elementary_settings_daemon@')
11− conf_data.set('VERSION', meson.project_version())
12− config_header = configure_file (
13− input: 'config.vala.in',
pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patchdeleted−15
@@ -1,15 +0,0 @@
1−diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala
2−index 11aa4c0..daf4a8a 100644
3−--- a/src/PantheonGreeter.vala
4−+++ b/src/PantheonGreeter.vala
5−@@ -474,6 +474,10 @@ public static int main (string [] args) {
6− Gdk.CursorType.LEFT_PTR);
7− Gdk.get_default_root_window ().set_cursor (cursor);
8−
9−+ var settings = Gtk.Settings.get_default ();
10−+ settings.gtk_icon_theme_name = "elementary";
11−+ settings.gtk_theme_name = "elementary";
12−+
13− var icon_theme = Gtk.IconTheme.get_default ();
14− icon_theme.add_resource_path ("/io/elementary/greeter/icons");
15−
pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala
2−index 11aa4c0..ae7bf7e 100644
3−--- a/src/PantheonGreeter.vala
4−+++ b/src/PantheonGreeter.vala
5−@@ -163,7 +163,7 @@ public class PantheonGreeter : Gtk.Window {
6− warning (e.message);
7− }
8− if (activate_numlock) {
9−- Granite.Services.System.execute_command ("/usr/bin/numlockx on");
10−+ Granite.Services.System.execute_command ("@numlockx@/bin/numlockx on");
11− }
12−
13− var screensaver_timeout = 60;
pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch → pkgs/desktops/pantheon/desktop/elementary-greeter/sysconfdir-install.patchrenamed+6−6
@@ -1,14 +1,14 @@
1−From 2384bee55a46eac44eb9d329be4c2a097e053ae1 Mon Sep 17 00:00:00 2001
1+From 7bb0d507cbb0122f167127b9f6460bd53d8234de Mon Sep 17 00:00:00 2001
22From: worldofpeace <worldofpeace@users.noreply.github.com>
3−Date: Tue, 17 Jul 2018 07:04:18 -0400
4−Subject: [PATCH 1/1] 'sysconfdir' will be etc not /etc for install
3+Date: Sat, 16 Mar 2019 16:07:24 -0400
4+Subject: [PATCH] 'sysconfdir' will be etc not /etc for install
55
66---
77 data/meson.build | 2 +-
88 1 file changed, 1 insertion(+), 1 deletion(-)
99
1010diff --git a/data/meson.build b/data/meson.build
11−index 7621b03..7c08eaf 100644
11+index fd54b75..b1120ae 100644
1212--- a/data/meson.build
1313+++ b/data/meson.build
1414@@ -20,7 +20,7 @@ i18n.merge_file (
@@ -19,7 +19,7 @@ index 7621b03..7c08eaf 100644
1919+ install_dir: join_paths(get_option('prefix'), 'etc', 'lightdm')
2020 )
2121
22− install_data(
22+ test (
2323--
24−2.17.1
24+2.19.2
2525
pkgs/desktops/pantheon/desktop/wingpanel/default.nix+4
@@ -14,6 +14,8 @@
1414, mutter
1515, json-glib
1616, python3
17+, elementary-gtk-theme
18+, elementary-icon-theme
1719}:
1820
1921stdenv.mkDerivation rec {
@@ -44,6 +46,8 @@ stdenv.mkDerivation rec {
4446 ];
4547
4648 buildInputs = [
49+ elementary-gtk-theme
50+ elementary-icon-theme
4751 gala
4852 granite
4953 gtk3