diff --git a/pkgs/by-name/ca/catppuccin-sddm/package.nix b/pkgs/by-name/ca/catppuccin-sddm/package.nix index ec2a14d0a6d3..9af2b6d7ac3e 100644 --- a/pkgs/by-name/ca/catppuccin-sddm/package.nix +++ b/pkgs/by-name/ca/catppuccin-sddm/package.nix @@ -2,35 +2,46 @@ lib, stdenvNoCC, fetchFromGitHub, + bash, just, + catppuccin-whiskers, kdePackages, flavor ? "mocha", + accent ? "mauve", font ? "Noto Sans", fontSize ? "9", background ? null, loginBackground ? false, + userIcon ? false, + clockEnabled ? true, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "catppuccin-sddm"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "catppuccin"; repo = "sddm"; - rev = "v${version}"; - hash = "sha256-mDOiIGcpIvl4d3Dtsb2AX/1OggFEJ+hAjCd2LH7lqv0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7S0DKyb+4lP+5HCPAJRw/KDls2ZO9kksdlwYSz2uQC8="; }; dontWrapQtApps = true; nativeBuildInputs = [ just + catppuccin-whiskers ]; propagatedBuildInputs = [ kdePackages.qtsvg ]; + postPatch = '' + substituteInPlace justfile \ + --replace-fail '#!/usr/bin/env bash' '#!${lib.getExe bash}' + ''; + buildPhase = '' runHook preBuild @@ -43,9 +54,9 @@ stdenvNoCC.mkDerivation rec { runHook preInstall mkdir -p "$out/share/sddm/themes/" - cp -r dist/catppuccin-${flavor} "$out/share/sddm/themes/catppuccin-${flavor}" + cp -r themes/catppuccin-${flavor}-${accent} "$out/share/sddm/themes/catppuccin-${flavor}-${accent}" - configFile=$out/share/sddm/themes/catppuccin-${flavor}/theme.conf + configFile=$out/share/sddm/themes/catppuccin-${flavor}-${accent}/theme.conf substituteInPlace $configFile \ --replace-fail 'Font="Noto Sans"' 'Font="${font}"' \ @@ -62,6 +73,16 @@ stdenvNoCC.mkDerivation rec { --replace-fail 'LoginBackground="false"' 'LoginBackground="true"' ''} + ${lib.optionalString userIcon '' + substituteInPlace $configFile \ + --replace-fail 'UserIcon="false"' 'UserIcon="true"' + ''} + + ${lib.optionalString (!clockEnabled) '' + substituteInPlace $configFile \ + --replace-fail 'ClockEnabled="true"' 'ClockEnabled="false"' + ''} + runHook postInstall ''; @@ -74,6 +95,7 @@ stdenvNoCC.mkDerivation rec { description = "Soothing pastel theme for SDDM"; homepage = "https://github.com/catppuccin/sddm"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gipphe ]; platforms = lib.platforms.linux; }; -} +})