git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/lightdm-gtk-greeter: don't wrap in module
commitb558eb8329d36f79cdb635aace92b5aa033eaee6 authorworldofpeace <worldofpeace@protonmail.ch> dateWed 11 Sep 2019, 07:07 (7 years ago) parent7814a2f
2 files changed+30−37
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix+7−29 pkgs/applications/display-managers/lightdm/gtk-greeter.nix+23−8
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix+7−29
@@ -15,34 +15,6 @@ let
1515 icons = cfg.iconTheme.package;
1616 cursors = cfg.cursorTheme.package;
1717
18− # The default greeter provided with this expression is the GTK greeter.
19− # Again, we need a few things in the environment for the greeter to run with
20− # fonts/icons.
21− wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" {
22− buildInputs = [ pkgs.makeWrapper ];
23− preferLocalBuild = true;
24− } ''
25− # This wrapper ensures that we actually get themes
26− makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
27− $out/greeter \
28− --prefix PATH : "${lib.getBin pkgs.stdenv.cc.libc}/bin" \
29− --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
30− --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \
31− --set GTK_EXE_PREFIX "${theme}" \
32− --set GTK_DATA_PREFIX "${theme}" \
33− --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \
34− --set XDG_CONFIG_HOME "${theme}/share" \
35− --set XCURSOR_PATH "${cursors}/share/icons"
36−
37− cat - > $out/lightdm-gtk-greeter.desktop << EOF
38− [Desktop Entry]
39− Name=LightDM Greeter
40− Comment=This runs the LightDM Greeter
41− Exec=$out/greeter
42− Type=Application
43− EOF
44− '';
45−
4618 gtkGreeterConf = writeText "lightdm-gtk-greeter.conf"
4719 ''
4820 [greeter]
@@ -185,10 +157,16 @@ in
185157 config = mkIf (ldmcfg.enable && cfg.enable) {
186158
187159 services.xserver.displayManager.lightdm.greeter = mkDefault {
188− package = wrappedGtkGreeter;
160+ package = pkgs.lightdm_gtk_greeter.xgreeters;
189161 name = "lightdm-gtk-greeter";
190162 };
191163
164+ environment.systemPackages = [
165+ cursors
166+ icons
167+ theme
168+ ];
169+
192170 environment.etc."lightdm/lightdm-gtk-greeter.conf".source = gtkGreeterConf;
193171
194172 };
pkgs/applications/display-managers/lightdm/gtk-greeter.nix+23−8
@@ -1,7 +1,18 @@
1−{ stdenv, fetchurl, lightdm, pkgconfig, intltool
2−, hicolor-icon-theme, makeWrapper
3−, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
4−, exo, at-spi2-core
1+{ stdenv
2+, lightdm_gtk_greeter
3+, fetchurl
4+, lightdm
5+, pkgconfig
6+, intltool
7+, linkFarm
8+, wrapGAppsHook
9+, useGTK2 ? false
10+, gtk2
11+, gtk3 # gtk3 seems better supported
12+, exo
13+, at-spi2-core
14+, librsvg
15+, hicolor-icon-theme
516}:
617
718#ToDo: bad icons with gtk2;
@@ -20,14 +31,15 @@ stdenv.mkDerivation rec {
2031 sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15";
2132 };
2233
23− nativeBuildInputs = [ pkgconfig ];
24− buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ]
34+ nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
35+ buildInputs = [ lightdm exo librsvg hicolor-icon-theme ]
2536 ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
2637
2738 configureFlags = [
2839 "--localstatedir=/var"
2940 "--sysconfdir=/etc"
3041 "--disable-indicator-services-command"
42+ "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically
3143 ] ++ stdenv.lib.optional useGTK2 "--with-gtk2";
3244
3345 preConfigure = ''
@@ -44,10 +56,13 @@ stdenv.mkDerivation rec {
4456 postInstall = ''
4557 substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
4658 --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
47− wrapProgram "$out/sbin/lightdm-gtk-greeter" \
48− --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share"
4959 '';
5060
61+ passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{
62+ path = "${lightdm_gtk_greeter}/share/xgreeters/lightdm-gtk-greeter.desktop";
63+ name = "lightdm-gtk-greeter.desktop";
64+ }];
65+
5166 meta = with stdenv.lib; {
5267 homepage = https://launchpad.net/lightdm-gtk-greeter;
5368 platforms = platforms.linux;