From 7ce82795e38712c551f170ca367b5e20f6aba45c Mon Sep 17 00:00:00 2001 From: name_snrl Date: Tue, 9 Apr 2024 01:29:46 +0500 Subject: [PATCH] where-is-my-sddm-theme: refactoring --- .../wh/where-is-my-sddm-theme/package.nix | 70 +++++++++++++++++++ .../themes/where-is-my-sddm-theme/default.nix | 50 ------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 70 insertions(+), 52 deletions(-) create mode 100644 pkgs/by-name/wh/where-is-my-sddm-theme/package.nix delete mode 100644 pkgs/data/themes/where-is-my-sddm-theme/default.nix 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 new file mode 100644 index 000000000000..e15ab121a41f --- /dev/null +++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix @@ -0,0 +1,70 @@ +{ + lib, + formats, + stdenvNoCC, + fetchFromGitHub, + qt6, + libsForQt5, + variants ? [ "qt6" ], + /* + An example of how you can override the background on the NixOS logo + + environment.systemPackages = [ + (pkgs.where-is-my-sddm-theme.override { + themeConfig.General = { + background = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + backgroundMode = "none"; + }; + }) + ]; + */ + themeConfig ? null, +}: + +let + user-cfg = (formats.ini { }).generate "theme.conf.user" themeConfig; + validVariants = [ + "qt5" + "qt6" + ]; +in + +lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants + +stdenvNoCC.mkDerivation rec { + pname = "where-is-my-sddm-theme"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "stepanzubkov"; + repo = pname; + rev = "v${version}"; + hash = "sha256-/D3i4QcE5+GbiAw32bFYJ7UxW/5NAl9FqQfiQc4akzI="; + }; + + propagatedUserEnvPkgs = + [ ] + ++ lib.optional (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ] + ++ lib.optional (lib.elem "qt6" variants) [ qt6.qt5compat ]; + + 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 + ''; + + meta = with lib; { + description = "The most minimalistic SDDM theme among all themes"; + homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme"; + license = licenses.mit; + maintainers = with maintainers; [ name-snrl ]; + }; +} diff --git a/pkgs/data/themes/where-is-my-sddm-theme/default.nix b/pkgs/data/themes/where-is-my-sddm-theme/default.nix deleted file mode 100644 index d55279dd33ce..000000000000 --- a/pkgs/data/themes/where-is-my-sddm-theme/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, formats -, stdenvNoCC -, fetchFromGitHub -, qtgraphicaleffects - /* An example of how you can override the background on the NixOS logo - * - * environment.systemPackages = [ - * (pkgs.where-is-my-sddm-theme.override { - * themeConfig.General = { - * background = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - * backgroundMode = "none"; - * }; - * }) - * ]; - */ -, themeConfig ? null -}: - -let - user-cfg = (formats.ini { }).generate "theme.conf.user" themeConfig; -in - -stdenvNoCC.mkDerivation rec { - pname = "where-is-my-sddm-theme"; - version = "1.8.0"; - - src = fetchFromGitHub { - owner = "stepanzubkov"; - repo = pname; - rev = "v${version}"; - hash = "sha256-/D3i4QcE5+GbiAw32bFYJ7UxW/5NAl9FqQfiQc4akzI="; - }; - - propagatedUserEnvPkgs = [ qtgraphicaleffects ]; - - installPhase = '' - mkdir -p $out/share/sddm/themes/ - 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 - ''; - - meta = with lib; { - description = "The most minimalistic SDDM theme among all themes"; - homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme"; - license = licenses.mit; - maintainers = with maintainers; [ name-snrl ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e82227fd83fd..b38be7cb9510 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25134,8 +25134,6 @@ with pkgs; whereami = callPackage ../development/libraries/whereami { }; - where-is-my-sddm-theme = libsForQt5.callPackage ../data/themes/where-is-my-sddm-theme { }; - wildmidi = callPackage ../development/libraries/wildmidi { inherit (darwin.apple_sdk.frameworks) OpenAL; };