From a4faf5e1d4f96f468c79c58125ecbda823e32ea9 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sun, 17 Oct 2021 15:42:16 +0300 Subject: [PATCH] orchis-theme: 2021-06-25 -> 2021-12-13 Co-authored-by: Sandro --- pkgs/data/themes/orchis-theme/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index f019009db9f8..ef7f88e3e955 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -5,18 +5,28 @@ , gnome-themes-extra , gtk-engine-murrine , sassc -, accentColor ? "default" +, tweaks ? [ ] # can be "solid" "compact" "black" "primary" }: -stdenvNoCC.mkDerivation rec { +let + validTweaks = [ "solid" "compact" "black" "primary" ]; + unknownTweaks = lib.subtractLists validTweaks tweaks; +in +assert lib.assertMsg (unknownTweaks == [ ]) '' + You entered wrong tweaks: ${toString unknownTweaks} + Valid tweaks are: ${toString validTweaks} +''; + +stdenvNoCC.mkDerivation +rec { pname = "orchis-theme"; - version = "2021-06-25"; + version = "2021-12-13"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-j0nsw1yR1yOckXiIMtzhC3w6kvfzxQQHgwdY6l0OuXw="; + sha256 = "sha256-PN2ucGMDzRv4v86X1zVIs9+GkbMWuja2WaSQLFvJYd0="; }; nativeBuildInputs = [ gtk3 sassc ]; @@ -31,7 +41,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - bash install.sh -d $out/share/themes -t ${accentColor} + bash install.sh -d $out/share/themes -t all ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} runHook postInstall '';