diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-08-01 16:15:24 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-08-01 16:36:52 +0800 |
| commit | 231631eb93aafcfcab8f549a8292b978a19c2513 (patch) | |
| tree | 1a3631a6fde0462491486e95ec04c4c884491107 | |
| parent | 2d37d649bc2e26deb5384770255d99391de2ef24 (diff) | |
| download | nixpkgs-231631eb93aafcfcab8f549a8292b978a19c2513.tar nixpkgs-231631eb93aafcfcab8f549a8292b978a19c2513.tar.gz nixpkgs-231631eb93aafcfcab8f549a8292b978a19c2513.tar.bz2 nixpkgs-231631eb93aafcfcab8f549a8292b978a19c2513.tar.lz nixpkgs-231631eb93aafcfcab8f549a8292b978a19c2513.tar.xz nixpkgs-231631eb93aafcfcab8f549a8292b978a19c2513.tar.zst nixpkgs-231631eb93aafcfcab8f549a8292b978a19c2513.zip | |
lightdm-gtk-greeter: rename from lightdm_gtk_greeter
To match the current naming convention.
| -rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/display-managers/lightdm/gtk-greeter.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index debd4b568bf..30940da103a 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -158,7 +158,7 @@ in config = mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm.greeter = mkDefault { - package = pkgs.lightdm_gtk_greeter.xgreeters; + package = pkgs.lightdm-gtk-greeter.xgreeters; name = "lightdm-gtk-greeter"; }; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index b012699a16b..8f28b9ac180 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -1,5 +1,5 @@ { lib, stdenv -, lightdm_gtk_greeter +, lightdm-gtk-greeter , fetchurl , lightdm , pkg-config @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{ - path = "${lightdm_gtk_greeter}/share/xgreeters/lightdm-gtk-greeter.desktop"; + path = "${lightdm-gtk-greeter}/share/xgreeters/lightdm-gtk-greeter.desktop"; name = "lightdm-gtk-greeter.desktop"; }]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aa86ec511f6..00e3c3f54a6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -752,6 +752,7 @@ mapAliases ({ libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22 libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22 libwnck3 = libwnck; + lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lighthouse = throw "lighthouse has been removed: abandoned by upstream"; # Added 2022-04-24 lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15 lilypond-unstable = lilypond; # Added 2021-03-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a19c44b88d6..00296f396e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30384,7 +30384,7 @@ with pkgs; inherit (xorg) libX11 libXdmcp libpthreadstubs; }; - lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { + lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { inherit (xfce) xfce4-dev-tools; }; |