diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-28 00:02:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-28 00:02:07 +0000 |
commit | 678711689037773117624ade4db4f977640cbb36 (patch) | |
tree | 4b900fe0c2d61be387687b901c36e8aa62739603 /pkgs/data | |
parent | 0a79f47878472cf5e12c1986a9a09829b0f32fee (diff) | |
parent | 0a8007498f9dba0d5feb191d16317ffa85a9e698 (diff) | |
download | nixpkgs-678711689037773117624ade4db4f977640cbb36.tar nixpkgs-678711689037773117624ade4db4f977640cbb36.tar.gz nixpkgs-678711689037773117624ade4db4f977640cbb36.tar.bz2 nixpkgs-678711689037773117624ade4db4f977640cbb36.tar.lz nixpkgs-678711689037773117624ade4db4f977640cbb36.tar.xz nixpkgs-678711689037773117624ade4db4f977640cbb36.tar.zst nixpkgs-678711689037773117624ade4db4f977640cbb36.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/redhat-official/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index 37ca9db9fa0..9daaffd0b4b 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: let - version = "2.3.2"; + version = "4.0.2"; in fetchFromGitHub { name = "redhat-official-${version}"; @@ -11,11 +11,13 @@ fetchFromGitHub { postFetch = '' tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype OTF/*.otf - install -m444 -Dt $out/share/fonts/truetype TTF/*.ttf + for kind in mono proportional; do + install -m444 -Dt $out/share/fonts/opentype fonts/$kind/static/otf/*.otf + install -m444 -Dt $out/share/fonts/truetype fonts/$kind/static/ttf/*.ttf + done ''; - sha256 = "1afvxmgif61hb17g8inmxvq30vkzwh30mydlqpf0zgvaaz8qdwmv"; + sha256 = "sha256-904uQtbAdLx9MJudLk/vVk/+uK0nsPbWbAeXrWxTHm8="; meta = with lib; { homepage = "https://github.com/RedHatOfficial/RedHatFont"; |