From ba1834b908cfc37e13e60d1eebafbbfe0519b4ff Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 27 Mar 2024 18:28:50 +0200 Subject: [PATCH] mousecape: move to by-name/mo - Previously package resided in darwin/mousecape due to confusion, this breaks the pkgs category hierarchy as mentioned by https://github.com/NixOS/nixpkgs/pull/299032#issuecomment-2021684755 - Also switched to using fetchzip - Fixed maintainer name --- .../mo/mousecape/package.nix} | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) rename pkgs/{os-specific/darwin/mousecape/default.nix => by-name/mo/mousecape/package.nix} (69%) diff --git a/pkgs/os-specific/darwin/mousecape/default.nix b/pkgs/by-name/mo/mousecape/package.nix similarity index 69% rename from pkgs/os-specific/darwin/mousecape/default.nix rename to pkgs/by-name/mo/mousecape/package.nix index 39ee1e5ca072..7604b360dd65 100644 --- a/pkgs/os-specific/darwin/mousecape/default.nix +++ b/pkgs/by-name/mo/mousecape/package.nix @@ -1,27 +1,22 @@ { lib , stdenvNoCC -, fetchurl -, unzip +, fetchzip }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mousecape"; version = "1813"; - src = fetchurl { + src = fetchzip { url = "https://github.com/alexzielenski/Mousecape/releases/download/${finalAttrs.version}/Mousecape_${finalAttrs.version}.zip"; - hash = "sha256-lp7HFGr1J+iQCUWVDplF8rFcTrGf+DX4baYzLsUi/9I="; + hash = "sha256-VjbvrXfsRFpbTJfIHFvyCxRdDcGNv0zzLToWn7lyLM8="; }; - sourceRoot = "."; - - nativeBuildInputs = [ unzip ]; - installPhase = '' runHook preInstall - mkdir -p $out/Applications - mv Mousecape.app $out/Applications + mkdir -p $out/Applications/Mousecape.app + cp -R . $out/Applications/Mousecape.app/ runHook postInstall ''; @@ -30,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "A cursor manager for macOS built using private, nonintrusive CoreGraphics APIs"; homepage = "https://github.com/alexzielenski/Mousecape"; license = with lib; licenses.free; - maintainers = with lib; with maintainers; [ DontEatOreo ]; + maintainers = with lib; with maintainers; [ donteatoreo ]; platforms = with lib; platforms.darwin; sourceProvenance = with lib; with sourceTypes; [ binaryNativeCode ]; };