From 23dec31e9850af3eb687e9dacb28ec9bb941dff7 Mon Sep 17 00:00:00 2001 From: name_snrl Date: Tue, 9 Apr 2024 07:02:04 +0500 Subject: [PATCH 1/2] where-is-my-sddm-theme: fix qt5 variant and add qtsvg to qt6 --- .../wh/where-is-my-sddm-theme/package.nix | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix index e15ab121a41f..382f2bf25436 100644 --- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix +++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix @@ -45,21 +45,31 @@ stdenvNoCC.mkDerivation rec { propagatedUserEnvPkgs = [ ] ++ lib.optional (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ] - ++ lib.optional (lib.elem "qt6" variants) [ qt6.qt5compat ]; + ++ lib.optional (lib.elem "qt6" variants) [ + qt6.qt5compat + qt6.qtsvg + ]; installPhase = '' mkdir -p $out/share/sddm/themes/ '' - + lib.optionalString (lib.elem "qt6" variants) '' - cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ - '' - + lib.optionalString (lib.elem "qt5" variants) '' - cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/ - '' - + lib.optionalString (lib.isAttrs themeConfig) '' - ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user - ''; + + lib.optionalString (lib.elem "qt6" variants) ( + '' + cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ + '' + + lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user + '' + ) + + lib.optionalString (lib.elem "qt5" variants) ( + '' + cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/ + '' + + lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme_qt5/theme.conf.user + '' + ); meta = with lib; { description = "The most minimalistic SDDM theme among all themes"; From 0bd01ec0bf1916eff160c3467a3eb2069039ac3e Mon Sep 17 00:00:00 2001 From: name_snrl Date: Tue, 9 Apr 2024 11:09:59 +0500 Subject: [PATCH 2/2] where-is-my-sddm-theme: add `meta.platforms` --- pkgs/by-name/wh/where-is-my-sddm-theme/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix index 382f2bf25436..6026a107f70b 100644 --- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix +++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix @@ -75,6 +75,7 @@ stdenvNoCC.mkDerivation rec { description = "The most minimalistic SDDM theme among all themes"; homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ name-snrl ]; }; }