tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
nixos/lightdm-tiny-greeter: remove `nixpkgs.config` usage
K900
2 years ago
7a7c1859
38461ff2
+6
-10
3 changed files
expand all
collapse all
unified
split
nixos
modules
services
x11
display-managers
lightdm-greeters
tiny.nix
pkgs
applications
display-managers
lightdm-tiny-greeter
default.nix
top-level
all-packages.nix
+4
-6
nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix
···
61
61
62
62
services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
63
63
64
64
-
nixpkgs.config.lightdm-tiny-greeter.conf =
64
64
+
services.xserver.displayManager.lightdm.greeter =
65
65
let
66
66
configHeader = ''
67
67
#include <gtk/gtk.h>
···
69
69
static const char *pass_text = "${cfg.label.pass}";
70
70
static const char *session = "${dmcfg.defaultSession}";
71
71
'';
72
72
+
config = optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig);
73
73
+
package = pkgs.lightdm-tiny-greeter.override { conf = config; };
72
74
in
73
73
-
optionalString (cfg.extraConfig != "")
74
74
-
(configHeader + cfg.extraConfig);
75
75
-
76
76
-
services.xserver.displayManager.lightdm.greeter =
77
75
mkDefault {
78
78
-
package = pkgs.lightdm-tiny-greeter.xgreeters;
76
76
+
package = package.xgreeters;
79
77
name = "lightdm-tiny-greeter";
80
78
};
81
79
+1
-1
pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
···
1
1
{ lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub
2
2
-
, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }:
2
2
+
, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, config, conf ? config.lightdm-tiny-greeter.conf or "" }:
3
3
4
4
stdenv.mkDerivation rec {
5
5
pname = "lightdm-tiny-greeter";
+1
-3
pkgs/top-level/all-packages.nix
···
35647
35647
35648
35648
lightdm-mobile-greeter = callPackage ../applications/display-managers/lightdm-mobile-greeter { };
35649
35649
35650
35650
-
lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter {
35651
35651
-
conf = config.lightdm-tiny-greeter.conf or "";
35652
35652
-
};
35650
35650
+
lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { };
35653
35651
35654
35652
ly = callPackage ../applications/display-managers/ly { };
35655
35653