From 47a9506e8856bf322cf8ea82c2e399309dc433c9 Mon Sep 17 00:00:00 2001 From: Redlonghead Date: Thu, 11 Dec 2025 22:04:32 -0600 Subject: [PATCH 1/2] elegant-sddm: replace with Qt6 compatible repo --- doc/release-notes/rl-2605.section.md | 2 ++ pkgs/by-name/el/elegant-sddm/package.nix | 38 ++++++++---------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index ae075ecb8f54..7c19b3180e1a 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -16,6 +16,8 @@ - `kanata` now requires `karabiner-dk` version 6.0+ or later. The package has been updated to use the new `karabiner-dk` package and the `darwinDriver` output stays at the version defined in the package. +- `elegant-sddm` has been updated to be Qt6 compatible. Themes for SDDM are slightly different so read the [wiki](https://wiki.nixos.org/wiki/SDDM_Themes) for more. + - `iroh` has been removed and split up into `iroh-dns-server` and `iroh-relay`. - All Log4Shell vulnerability scanners were removed, as they were all unmaintained upstream and are no longer relevant given that the vulnerability has been fixed upstream for several years. diff --git a/pkgs/by-name/el/elegant-sddm/package.nix b/pkgs/by-name/el/elegant-sddm/package.nix index dc5ac6d4638e..2a5956b71023 100644 --- a/pkgs/by-name/el/elegant-sddm/package.nix +++ b/pkgs/by-name/el/elegant-sddm/package.nix @@ -3,18 +3,10 @@ formats, stdenvNoCC, fetchFromGitHub, - libsForQt5, - /* - An example of how you can override the background with a NixOS wallpaper - * - * environment.systemPackages = [ - * (pkgs.elegant-sddm.override { - * themeConfig.General = { - background = "${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}"; - * }; - * }) - * ]; - */ + kdePackages, + + # Override themeConfig.General.background for custom backgrounds + # https://wiki.nixos.org/wiki/SDDM_Themes themeConfig ? null, }: @@ -24,18 +16,18 @@ in stdenvNoCC.mkDerivation { pname = "elegant-sddm"; - version = "unstable-2024-02-08"; + version = "0-unstable-2024-03-30"; src = fetchFromGitHub { - owner = "surajmandalcell"; - repo = "Elegant-sddm"; - rev = "3102e880f46a1b72c929d13cd0a3fb64f973952a"; - hash = "sha256-yn0fTYsdZZSOcaYlPCn8BUIWeFIKcTI1oioTWqjYunQ="; + owner = "rainD4X"; + repo = "Elegant-sddm-qt6"; + rev = "66952cbe32460938c0b6e8c6cf3343047af098f0"; + hash = "sha256-l4gv1PEVWpLmzNt1c+dHTHtM5WlEsXdDgW3q8U3FMUQ="; }; dontWrapQtApps = true; propagatedBuildInputs = [ - libsForQt5.qtgraphicaleffects + kdePackages.qt5compat ]; installPhase = '' @@ -51,15 +43,9 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - postFixup = '' - mkdir -p $out/nix-support - - echo ${libsForQt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages - ''; - meta = { - description = "Sleek and stylish SDDM theme crafted in QML"; - homepage = "https://github.com/surajmandalcell/Elegant-sddm"; + description = "Sleek and stylish SDDM theme crafted in QML for Qt6"; + homepage = "https://github.com/rainD4X/Elegant-sddm-qt6"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; From 6bbcc6003c5666f664c2cf68070331a3acfc4fdf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 13 Dec 2025 09:13:36 +0000 Subject: [PATCH 2/2] elegant-sddm: add redlonghead to maintainers --- pkgs/by-name/el/elegant-sddm/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/el/elegant-sddm/package.nix b/pkgs/by-name/el/elegant-sddm/package.nix index 2a5956b71023..aba9e5b902c2 100644 --- a/pkgs/by-name/el/elegant-sddm/package.nix +++ b/pkgs/by-name/el/elegant-sddm/package.nix @@ -47,6 +47,9 @@ stdenvNoCC.mkDerivation { description = "Sleek and stylish SDDM theme crafted in QML for Qt6"; homepage = "https://github.com/rainD4X/Elegant-sddm-qt6"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ GaetanLepage ]; + maintainers = with lib.maintainers; [ + GaetanLepage + redlonghead + ]; }; }