@@ -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; {