cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #176177 from Artturin/fixfont1

Browse source
This commit is contained in:
Artturi 2022-06-04 14:58:51 +03:00 committed by GitHub
commit fbe4d9e2de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/data/fonts/font-awesome/default.nix
View file

@ -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=";
};
}

19
pkgs/data/fonts/mplus-outline-fonts/default.nix
View file

@ -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; {