From 31193fae957745e6537d30ddaad2b3449942317c Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Thu, 2 May 2024 12:43:59 +0200 Subject: [PATCH 1/2] maintainers: add lordmzte --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1e3ee0931840..b3ada9c038f5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11637,6 +11637,16 @@ githubId = 5624721; name = "Ben Wolsieffer"; }; + lordmzte = { + name = "Moritz Thomae"; + email = "lord@mzte.de"; + matrix = "@lordmzte:mzte.de"; + github = "LordMZTE"; + githubId = 28735087; + keys = [{ + fingerprint = "AB47 3D70 53D2 74CA DC2C 230C B648 02DC 33A6 4FF6"; + }]; + }; lord-valen = { name = "Lord Valen"; matrix = "@lord-valen:matrix.org"; From aadaa13a0ec05f1f571e59edb208d9af5d94a36c Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Thu, 2 May 2024 14:35:18 +0200 Subject: [PATCH 2/2] lyra-cursors: init at 0-unstable-2021-12-04 --- maintainers/maintainer-list.nix | 4 +- pkgs/by-name/ly/lyra-cursors/package.nix | 82 ++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/ly/lyra-cursors/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b3ada9c038f5..9be9b3565de7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11643,9 +11643,7 @@ matrix = "@lordmzte:mzte.de"; github = "LordMZTE"; githubId = 28735087; - keys = [{ - fingerprint = "AB47 3D70 53D2 74CA DC2C 230C B648 02DC 33A6 4FF6"; - }]; + keys = [ { fingerprint = "AB47 3D70 53D2 74CA DC2C 230C B648 02DC 33A6 4FF6"; } ]; }; lord-valen = { name = "Lord Valen"; diff --git a/pkgs/by-name/ly/lyra-cursors/package.nix b/pkgs/by-name/ly/lyra-cursors/package.nix new file mode 100644 index 000000000000..b1ce03d965fb --- /dev/null +++ b/pkgs/by-name/ly/lyra-cursors/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenvNoCC, + inkscape, + xcursorgen, + fetchFromGitHub, + fetchpatch2, +}: +let + styles = [ + "LyraB" + "LyraF" + "LyraG" + "LyraP" + "LyraQ" + "LyraR" + "LyraS" + "LyraX" + "LyraY" + ]; + + # This is a patch from a fork of the upstream repository which addresses several issues with the + # build script such as the fact that the style to build isn't hardcoded. We don't simply use this + # fork as source, as the upstream repository is what we want to track. + buildScriptPatch = fetchpatch2 { + name = "use-more-flexible-build-script.patch"; + url = "https://github.com/KiranWells/Lyra-Cursors/commit/2735acb37a51792388497c666cc28370660217cb.patch?full_index=1"; + hash = "sha256-KCT4zNdep1TB7Oa4qrPw374ahT30o9/QrNTEgobp8zM="; + }; +in +stdenvNoCC.mkDerivation { + pname = "lyra-cursors"; + version = "0-unstable-2021-12-04"; + + src = fetchFromGitHub { + owner = "yeyushengfan258"; + repo = "Lyra-Cursors"; + rev = "c096c54034f95bd35699b3226250e5c5ec015d9a"; + hash = "sha256-lfaX8ouE0JaQwVBpAGsrLIExQZ2rCSFKPs3cch17eYg="; + }; + + nativeBuildInputs = [ + inkscape + xcursorgen + ]; + + patches = [ buildScriptPatch ]; + + dontConfigure = true; + + postPatch = '' + patchShebangs build.sh + ''; + + buildPhase = '' + runHook preBuild + + rm -r dist + for THEME in ${lib.escapeShellArgs styles}; do + ./build.sh "$THEME" + done + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + mv dist/*-cursors $out/share/icons + + runHook postInstall + ''; + + meta = { + description = "A cursor theme inspired by macOS and based on capitaine-cursors"; + homepage = "https://github.com/yeyushengfan258/Lyra-Cursors"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ lordmzte ]; + }; +}