diff options
| author | Artturi <Artturin@artturin.com> | 2022-06-04 23:07:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-04 23:07:00 +0300 |
| commit | d6cb04299ce8964290ae7fdcb87aa50da0500b5c (patch) | |
| tree | 754ae2a88115f9d67652ba4a914ae2e2cfc6e036 | |
| parent | Merge pull request #176231 from NixOS/backport-176183-to-release-22.05 (diff) | |
| parent | font-awesome,mplus-fonts: fix build (diff) | |
| download | nixpkgs-d6cb04299ce8964290ae7fdcb87aa50da0500b5c.tar.gz | |
Merge pull request #176236 from NixOS/backport-176177-to-release-22.05
| -rw-r--r-- | pkgs/data/fonts/font-awesome/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/data/fonts/mplus-outline-fonts/default.nix | 19 |
2 files changed, 17 insertions, 12 deletions
diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index 3403660b1e8f..973df59e408b 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -9,8 +9,10 @@ let inherit rev; postFetch = '' - tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf + install -m444 -Dt $out/share/fonts/opentype $out/{fonts,otfs}/*.otf + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; inherit sha256; @@ -38,7 +40,7 @@ in v4 = font-awesome { version = "4.7.0"; rev = "v4.7.0"; - sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9"; + sha256 = "sha256-qdrIwxAB+z+4PXrKrj6bBuiJY0DYQuHm2DRng5sYEck="; }; v5 = font-awesome { version = "5.15.3"; @@ -46,6 +48,6 @@ in }; v6 = font-awesome { version = "6.1.1"; - sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA"; + sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA="; }; } diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index d9cfadd5f088..c3def549aa43 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -5,11 +5,12 @@ in { osdnRelease = fetchzip { name = "${pname}-osdn"; url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz"; - sha256 = "16jirhkjs46ac8cdk2w4xkpv989gmz7i8gnrq9bck13rbil7wlzr"; + sha256 = "sha256-+VN+aFx5hMlWwtk+FM+vL6G07+yEi9kYYsoQLSfMUZo="; postFetch = '' - mkdir -p $out/share/fonts/truetype/${pname} - tar xvJf $downloadedFile - mv */*.ttf $out/share/fonts/truetype/${pname} + install -m444 -Dt $out/share/fonts/truetype/${pname} $out/*.ttf + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; meta = with lib; { @@ -26,12 +27,14 @@ in { owner = "coz-m"; repo = "MPLUS_FONTS"; rev = "336fec4e9e7c1e61bd22b82e6364686121cf3932"; - sha256 = "1ha92hyzcfbbq682c50k8clbhigc09rcb9mxjzjwqfj9rfp348id"; + sha256 = "sha256-LSIyrstJOszll72mxXIC7EW4KEMTFCaQwWs59j0UScE="; postFetch = '' mkdir -p $out/share/fonts/{truetype,opentype}/${pname} - tar xvzf $downloadedFile - mv */fonts/ttf/* $out/share/fonts/truetype/${pname} - mv */fonts/otf/* $out/share/fonts/opentype/${pname} + mv $out/fonts/ttf/* $out/share/fonts/truetype/${pname} + mv $out/fonts/otf/* $out/share/fonts/opentype/${pname} + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; meta = with lib; { |