From 4eb382953974587047fc1d0b53ec26375900f084 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 13 May 2020 13:24:14 +0800 Subject: [PATCH 1/2] sarasa-gothic: replace p7zip with libarchive --- pkgs/data/fonts/sarasa-gothic/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 1be4835e20c9..eb1b7bf49e31 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, p7zip }: +{ lib, fetchurl, libarchive }: let version = "0.8.2"; @@ -12,7 +12,8 @@ in fetchurl { downloadToTemp = true; postFetch = '' - ${p7zip}/bin/7z x $downloadedFile -o$out/share/fonts + mkdir -p $out/share/fonts + ${libarchive}/bin/bsdtar -xf $downloadedFile -C $out/share/fonts ''; meta = with lib; { From c8d1573dac82ae6500f89cecd4207f24975e3f65 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 13 May 2020 13:28:16 +0800 Subject: [PATCH 2/2] sarasa-gothic: 0.8.0 -> 0.12.6 --- pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index eb1b7bf49e31..96bfaf191c3d 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, libarchive }: let - version = "0.8.2"; + version = "0.12.6"; in fetchurl { name = "sarasa-gothic-${version}"; url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "17xkpklb6spi10132lq658fwvrms3fs7ksb9j098z9vaqad1k51q"; + sha256 = "1b15gsmv2jr0r8xssr8216s8xsghr6w5wm3w3imm3qlh3kqk1qg8"; recursiveHash = true; downloadToTemp = true;