From bb84f79e07a52ae2f67025ae2495bf826fde7b69 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 23 Nov 2025 19:24:47 +0100
Subject: [PATCH] lightdm: move to pkgs/by-name

---
 .../li}/lightdm/fix-paths.patch               |  0
 .../li/lightdm/package.nix}                   | 27 ++++++++++++-------
 .../li}/lightdm/use-regular-gettext.patch     |  0
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 17 insertions(+), 12 deletions(-)
 rename pkgs/{applications/display-managers => by-name/li}/lightdm/fix-paths.patch (100%)
 rename pkgs/{applications/display-managers/lightdm/default.nix => by-name/li/lightdm/package.nix} (86%)
 rename pkgs/{applications/display-managers => by-name/li}/lightdm/use-regular-gettext.patch (100%)

diff --git a/pkgs/applications/display-managers/lightdm/fix-paths.patch b/pkgs/by-name/li/lightdm/fix-paths.patch
similarity index 100%
rename from pkgs/applications/display-managers/lightdm/fix-paths.patch
rename to pkgs/by-name/li/lightdm/fix-paths.patch
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/by-name/li/lightdm/package.nix
similarity index 86%
rename from pkgs/applications/display-managers/lightdm/default.nix
rename to pkgs/by-name/li/lightdm/package.nix
index afd0337f0d75..49931a0ba5ed 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/by-name/li/lightdm/package.nix
@@ -27,13 +27,13 @@
   vala,
   fetchpatch,
   withQt5 ? false,
-  qtbase,
+  qt5,
   yelp-tools,
   yelp-xsl,
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lightdm";
   version = "1.32.0";
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "lightdm";
-    tag = version;
+    tag = finalAttrs.version;
     sha256 = "sha256-ttNlhWD0Ran4d3QvZ+PxbFbSUGMkfrRm+hJdQxIDJvM=";
   };
 
@@ -74,13 +74,13 @@ stdenv.mkDerivation rec {
     pam
     polkit
   ]
-  ++ lib.optional withQt5 qtbase;
+  ++ lib.optional withQt5 qt5.qtbase;
 
   patches = [
     # Adds option to disable writing dmrc files
     (fetchpatch {
       url = "https://src.fedoraproject.org/rpms/lightdm/raw/4cf0d2bed8d1c68970b0322ccd5dbbbb7a0b12bc/f/lightdm-1.25.1-disable_dmrc.patch";
-      sha256 = "06f7iabagrsiws2l75sx2jyljknr9js7ydn151p3qfi104d1541n";
+      hash = "sha256-NpASGgEhOjxuKME2f7RM2U5JvRRdl0OF5lHnp5aKxxk=";
     })
 
     # Hardcode plymouth to fix transitions.
@@ -128,11 +128,18 @@ stdenv.mkDerivation rec {
     tests = { inherit (nixosTests) lightdm; };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/canonical/lightdm";
     description = "Cross-desktop display manager";
-    platforms = platforms.linux;
-    license = licenses.gpl3;
-    teams = [ teams.pantheon ];
+    platforms = lib.platforms.linux;
+    license = with lib.licenses; [
+      gpl3Plus
+      # and (
+      lgpl2Only
+      # or
+      lgpl3Only
+      # )
+    ];
+    teams = [ lib.teams.pantheon ];
   };
-}
+})
diff --git a/pkgs/applications/display-managers/lightdm/use-regular-gettext.patch b/pkgs/by-name/li/lightdm/use-regular-gettext.patch
similarity index 100%
rename from pkgs/applications/display-managers/lightdm/use-regular-gettext.patch
rename to pkgs/by-name/li/lightdm/use-regular-gettext.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15d6f79d95a0..85abe919ad40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12160,8 +12160,6 @@ with pkgs;
     stdenv = stdenv_32bit;
   };
 
-  lightdm = libsForQt5.callPackage ../applications/display-managers/lightdm { };
-
   lightdm_qt = lightdm.override { withQt5 = true; };
 
   lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix {