From f874f8c5fe559634e0ad7bfa000023d2dbcdf1ba Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sun, 23 Nov 2025 19:30:34 +0100 Subject: [PATCH] lightdm-gtk-greeter: move to pkgs/by-name --- .../li/lightdm-gtk-greeter/package.nix} | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 9 insertions(+), 13 deletions(-) rename pkgs/{applications/display-managers/lightdm/gtk-greeter.nix => by-name/li/lightdm-gtk-greeter/package.nix} (84%) diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/by-name/li/lightdm-gtk-greeter/package.nix similarity index 84% rename from pkgs/applications/display-managers/lightdm/gtk-greeter.nix rename to pkgs/by-name/li/lightdm-gtk-greeter/package.nix index 3c8b6d886dc5..b6b62599d139 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/by-name/li/lightdm-gtk-greeter/package.nix @@ -9,26 +9,26 @@ linkFarm, wrapGAppsHook3, gtk3, - xfce4-dev-tools, + xfce, at-spi2-core, librsvg, hicolor-icon-theme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lightdm-gtk-greeter"; version = "2.0.9"; src = fetchurl { # Release tarball differs from source tarball. - url = "https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-${version}/lightdm-gtk-greeter-${version}.tar.gz"; + url = "https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-${finalAttrs.version}/lightdm-gtk-greeter-${finalAttrs.version}.tar.gz"; hash = "sha256-yP3xmKqaP50NrQtI3+I8Ine3kQfo/PxillKQ8QgfZF0="; }; nativeBuildInputs = [ pkg-config intltool - xfce4-dev-tools + xfce.xfce4-dev-tools wrapGAppsHook3 ]; @@ -72,12 +72,12 @@ stdenv.mkDerivation rec { } ]; - meta = with lib; { + meta = { homepage = "https://github.com/Xubuntu/lightdm-gtk-greeter"; description = "GTK greeter for LightDM"; mainProgram = "lightdm-gtk-greeter"; - platforms = platforms.linux; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ bobby285271 ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ bobby285271 ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15d6f79d95a0..5b39838bbb31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12164,10 +12164,6 @@ with pkgs; lightdm_qt = lightdm.override { withQt5 = true; }; - lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { - inherit (xfce) xfce4-dev-tools; - }; - curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; curaengine = callPackage ../applications/misc/curaengine {