diff --git a/pkgs/by-name/mo/monaspace/package.nix b/pkgs/by-name/mo/monaspace/package.nix index 2330e3aed858..da3fe65ddf0f 100644 --- a/pkgs/by-name/mo/monaspace/package.nix +++ b/pkgs/by-name/mo/monaspace/package.nix @@ -1,17 +1,18 @@ { lib, stdenvNoCC, - fetchzip, + fetchFromGitHub, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "monaspace"; - version = "1.200"; + version = "1.301"; - src = fetchzip { - url = "https://github.com/githubnext/monaspace/releases/download/v${finalAttrs.version}/monaspace-v${finalAttrs.version}.zip"; - stripRoot = false; - hash = "sha256-j1xQYVxfTNDVuzCKvT5FbU29t8XsH4XqcZ477sjydts="; + src = fetchFromGitHub { + owner = "githubnext"; + repo = "monaspace"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8tPwm92ZtaXL9qeDL+ay9PdXLUBBsspdk7/0U8VO0Tg="; }; outputs = [ @@ -20,16 +21,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; installPhase = '' - runHook preInstall + # Install TrueType fonts + install -Dm644 -t $out/share/fonts/truetype fonts/Frozen\ Fonts/*/*.ttf + install -Dm644 -t $out/share/fonts/truetype fonts/Variable\ Fonts/*/*.ttf - pushd monaspace-v${finalAttrs.version}/fonts/ - install -Dm644 frozen/*.ttf -t $out/share/fonts/truetype - install -Dm644 otf/*.otf -t $out/share/fonts/opentype - install -Dm644 variable/*.ttf -t $out/share/fonts/truetype - install -Dm644 webfonts/*.woff -t $woff/share/fonts/woff - popd + # Install OpenType fonts + install -Dm644 -t $out/share/fonts/opentype fonts/Static\ Fonts/*/*.otf + install -Dm644 -t $out/share/fonts/opentype fonts/NerdFonts/*/*.otf - runHook postInstall + # Install Web fonts + install -Dm644 -t $woff/share/fonts/woff fonts/Web\ Fonts/*/*/*.woff + install -Dm644 -t $woff/share/fonts/woff fonts/Web\ Fonts/*/*/*.woff2 ''; meta = {