Merge master into haskell-updates

This commit is contained in:
github-actions[bot]
2022-12-24 00:10:55 +00:00
committed by GitHub
110 changed files with 2138 additions and 1195 deletions

View File

@@ -6,12 +6,13 @@
, jdupes
, roundedIcons ? false
, blackPanelIcons ? false
, allColorVariants ? false
, colorVariants ? [ ]
,
}:
let pname = "Fluent-icon-theme";
in
lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "grey" "orange" "pink" "purple" "red" "yellow" "teal" "all" ] colorVariants
lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "grey" "orange" "pink" "purple" "red" "yellow" "teal" ] colorVariants
stdenvNoCC.mkDerivation rec {
inherit pname;
@@ -43,10 +44,11 @@ stdenvNoCC.mkDerivation rec {
./install.sh --dest $out/share/icons \
--name Fluent \
${builtins.toString colorVariants} \
${lib.optionalString allColorVariants "--all"} \
${lib.optionalString roundedIcons "--round"} \
${lib.optionalString blackPanelIcons "--black"}
jdupes --link-soft --recurse $out/share
jdupes --quiet --link-soft --recurse $out/share
runHook postInstall
'';

View File

@@ -5,24 +5,18 @@
stdenvNoCC.mkDerivation rec {
pname = "nordzy-cursor-theme";
version = "0.1.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "alvatip";
repo = "Nordzy-cursors";
rev = "v${version}";
sha256 = "XabfKFyeII7Xl+ozzpPnc4xFH4B7GzCTLq4M1QPSZPw=";
sha256 = "sha256-q9PEEyxejRQ8UCwbqsfOCL7M70pLCOLyCx8gEFmZkWA=";
};
installPhase = ''
mkdir -p $out/share/icons
cp -r nordzy-dark/ $out/share/icons/Nordzy-cursors
mv $out/share/icons/Nordzy-cursors/index.theme $out/share/icons/Nordzy-cursors/cursor.theme
mv $out/share/icons/Nordzy-cursors/Nordzy-cursors $out/share/icons/Nordzy-cursors/cursors
cp -r nordzy-white/ $out/share/icons/Nordzy-white-cursors
mv $out/share/icons/Nordzy-white-cursors/index.theme $out/share/icons/Nordzy-white-cursors/cursor.theme
mv $out/share/icons/Nordzy-white-cursors/Nordzy-white-cursors $out/share/icons/Nordzy-white-cursors/cursors
cp -r Nordzy-cursors{,-white,-lefthand} $out/share/icons
'';
meta = with lib; {