diff options
| author | K900 <me@0upti.me> | 2023-09-26 17:57:23 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-09-26 18:02:00 +0300 |
| commit | 7a7c1859cdb11ba331a75b9a4888e36f5ef17aca (patch) | |
| tree | 04949786032ad34656505c3ae5b6d98362a45c51 | |
| parent | 38461ff27aa4b0511cf1b1f17a62d415ec88cc5c (diff) | |
| download | nixlib-7a7c1859cdb11ba331a75b9a4888e36f5ef17aca.tar nixlib-7a7c1859cdb11ba331a75b9a4888e36f5ef17aca.tar.gz nixlib-7a7c1859cdb11ba331a75b9a4888e36f5ef17aca.tar.bz2 nixlib-7a7c1859cdb11ba331a75b9a4888e36f5ef17aca.tar.lz nixlib-7a7c1859cdb11ba331a75b9a4888e36f5ef17aca.tar.xz nixlib-7a7c1859cdb11ba331a75b9a4888e36f5ef17aca.tar.zst nixlib-7a7c1859cdb11ba331a75b9a4888e36f5ef17aca.zip | |
nixos/lightdm-tiny-greeter: remove `nixpkgs.config` usage
3 files changed, 6 insertions, 10 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix index 8d6bfa98a7e4..dede7680ecb3 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix @@ -61,7 +61,7 @@ in services.xserver.displayManager.lightdm.greeters.gtk.enable = false; - nixpkgs.config.lightdm-tiny-greeter.conf = + services.xserver.displayManager.lightdm.greeter = let configHeader = '' #include <gtk/gtk.h> @@ -69,13 +69,11 @@ in static const char *pass_text = "${cfg.label.pass}"; static const char *session = "${dmcfg.defaultSession}"; ''; + config = optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig); + package = pkgs.lightdm-tiny-greeter.override { conf = config; }; in - optionalString (cfg.extraConfig != "") - (configHeader + cfg.extraConfig); - - services.xserver.displayManager.lightdm.greeter = mkDefault { - package = pkgs.lightdm-tiny-greeter.xgreeters; + package = package.xgreeters; name = "lightdm-tiny-greeter"; }; diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 53f004c2a367..bb70fa299d10 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub -, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: +, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, config, conf ? config.lightdm-tiny-greeter.conf or "" }: stdenv.mkDerivation rec { pname = "lightdm-tiny-greeter"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91b3c4469f1a..ed7ae679b6c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35647,9 +35647,7 @@ with pkgs; lightdm-mobile-greeter = callPackage ../applications/display-managers/lightdm-mobile-greeter { }; - lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { - conf = config.lightdm-tiny-greeter.conf or ""; - }; + lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { }; ly = callPackage ../applications/display-managers/ly { }; |