From 834287523c5df0ba0fc6e8f162209f6d48e52060 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 8 Sep 2022 14:55:32 -0600 Subject: [PATCH 1/3] atkinson-hyperlegible: Fix build Fallout from #173430. --- pkgs/data/fonts/atkinson-hyperlegible/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/atkinson-hyperlegible/default.nix b/pkgs/data/fonts/atkinson-hyperlegible/default.nix index ef7425e12e49..8b2b04553726 100644 --- a/pkgs/data/fonts/atkinson-hyperlegible/default.nix +++ b/pkgs/data/fonts/atkinson-hyperlegible/default.nix @@ -12,8 +12,10 @@ in fetchFromGitHub { sha256 = "sha256-urSTqC3rfDRM8IMG+edwKEe7NPiTuDZph3heGHzLDks="; postFetch = '' - tar xf $downloadedFile --strip=1 - install -Dm644 -t $out/share/fonts/opentype fonts/otf/* + install -Dm644 -t $out/share/fonts/opentype $out/fonts/otf/* + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; meta = with lib; { From 40e49795aa405221e35501da797d3f3351d19cf8 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 8 Sep 2022 14:55:32 -0600 Subject: [PATCH 2/3] publicsuffix-list: Fix build Fallout from #173430. Fixes #178825. --- pkgs/data/misc/publicsuffix-list/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix index db74b74f22d9..063e120d3c4b 100644 --- a/pkgs/data/misc/publicsuffix-list/default.nix +++ b/pkgs/data/misc/publicsuffix-list/default.nix @@ -11,8 +11,10 @@ in fetchFromGitHub { sha256 = "sha256-Q8uIXM1CMu8dlWcVoL17M1XRGu3kG7Y7jpx0oHQh+2I="; postFetch = '' - tar xf $downloadedFile --strip=1 - install -Dm0444 public_suffix_list.dat tests/test_psl.txt -t $out/share/publicsuffix + install -Dm0444 $out/public_suffix_list.dat $out/tests/test_psl.txt -t $out/share/publicsuffix + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; meta = with lib; { From 7df746316d7ad615811a558169478c55b227e536 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 8 Sep 2022 14:55:32 -0600 Subject: [PATCH 3/3] hermit: Fix build Fallout from #173430. --- pkgs/data/fonts/hermit/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/data/fonts/hermit/default.nix index 3ff5dd368292..999a8995b46e 100644 --- a/pkgs/data/fonts/hermit/default.nix +++ b/pkgs/data/fonts/hermit/default.nix @@ -8,9 +8,12 @@ in fetchzip rec { url = "https://pcaro.es/d/otf-${name}.tar.gz"; + stripRoot = false; postFetch = '' - tar xf $downloadedFile - install -m444 -Dt $out/share/fonts/opentype *.otf + install -m444 -Dt $out/share/fonts/opentype $out/*.otf + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; sha256 = "127hnpxicqya7v1wmzxxqafq3aj1n33i4j5ncflbw6gj5g3bizwl";