nixos/lightdm-tiny-greeter: remove `nixpkgs.config` usage

K900 7a7c1859 38461ff2

+6 -10
+4 -6
nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix
··· 61 62 services.xserver.displayManager.lightdm.greeters.gtk.enable = false; 63 64 - nixpkgs.config.lightdm-tiny-greeter.conf = 65 let 66 configHeader = '' 67 #include <gtk/gtk.h> ··· 69 static const char *pass_text = "${cfg.label.pass}"; 70 static const char *session = "${dmcfg.defaultSession}"; 71 ''; 72 in 73 - optionalString (cfg.extraConfig != "") 74 - (configHeader + cfg.extraConfig); 75 - 76 - services.xserver.displayManager.lightdm.greeter = 77 mkDefault { 78 - package = pkgs.lightdm-tiny-greeter.xgreeters; 79 name = "lightdm-tiny-greeter"; 80 }; 81
··· 61 62 services.xserver.displayManager.lightdm.greeters.gtk.enable = false; 63 64 + services.xserver.displayManager.lightdm.greeter = 65 let 66 configHeader = '' 67 #include <gtk/gtk.h> ··· 69 static const char *pass_text = "${cfg.label.pass}"; 70 static const char *session = "${dmcfg.defaultSession}"; 71 ''; 72 + config = optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig); 73 + package = pkgs.lightdm-tiny-greeter.override { conf = config; }; 74 in 75 mkDefault { 76 + package = package.xgreeters; 77 name = "lightdm-tiny-greeter"; 78 }; 79
+1 -1
pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
··· 1 { lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub 2 - , pkg-config, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: 3 4 stdenv.mkDerivation rec { 5 pname = "lightdm-tiny-greeter";
··· 1 { lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub 2 + , pkg-config, lightdm, gtk3, glib, wrapGAppsHook, config, conf ? config.lightdm-tiny-greeter.conf or "" }: 3 4 stdenv.mkDerivation rec { 5 pname = "lightdm-tiny-greeter";
+1 -3
pkgs/top-level/all-packages.nix
··· 35647 35648 lightdm-mobile-greeter = callPackage ../applications/display-managers/lightdm-mobile-greeter { }; 35649 35650 - lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { 35651 - conf = config.lightdm-tiny-greeter.conf or ""; 35652 - }; 35653 35654 ly = callPackage ../applications/display-managers/ly { }; 35655
··· 35647 35648 lightdm-mobile-greeter = callPackage ../applications/display-managers/lightdm-mobile-greeter { }; 35649 35650 + lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { }; 35651 35652 ly = callPackage ../applications/display-managers/ly { }; 35653