diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-31 03:00:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-31 03:00:02 +0100 |
| commit | 17f82aa726333bb86882a6261f2e43697042baba (patch) | |
| tree | 264831196ecd000bd0fa8edf068f83ec1e0a8b3e /pkgs/data | |
| parent | 518131bba87a7c031a6495d5ba3b341ac5f97f4c (diff) | |
| parent | e8cc88899e349d12b955b94b6fc8a0fe9ae43ef6 (diff) | |
Merge pull request #213675 from wegank/comfortaa-convert
comfortaa: convert to stdenvNoCC.mkDerivation
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/comfortaa/default.nix | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix index fc7ce56f79651..f47da9fc5306a 100644 --- a/pkgs/data/fonts/comfortaa/default.nix +++ b/pkgs/data/fonts/comfortaa/default.nix @@ -1,28 +1,37 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "2021-07-29"; -in fetchFromGitHub rec { - name = "comfortaa-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "comfortaa"; + version = "unstable-2021-07-29"; - owner = "googlefonts"; - repo = "comfortaa"; - rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b"; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = pname; + rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b"; + postFetch = '' + # Remove the OTF fonts as they are not needed and cause a hash mismatch + rm -rf $out/fonts/{OTF,otf} + ''; + hash = "sha256-4ZBRaQyYlnt9l4NgBHezuCnR3rKTJ37L41RTbGAhd0M="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype $out/share/doc/comfortaa cp fonts/TTF/*.ttf $out/share/fonts/truetype cp FONTLOG.txt README.md $out/share/doc/comfortaa - ''; - sha256 = "12ad7qy11q49iv9h3l2d7x7y7kf0hxbqhclb92bzwig8dzly9n2k"; + runHook postInstall + ''; meta = with lib; { homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949"; description = "A clean and modern font suitable for headings and logos"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } |