nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 07:01:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
K900 2023-09-26 17:57:23 +03:00
parent 38461ff27a
commit 7a7c1859cd
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix
View File

@ -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";
};

2
pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
View File

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

4
pkgs/top-level/all-packages.nix
View File

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