Merge pull request #175043 from NixOS/backport-174776-to-release-22.05

[Backport release-22.05] xkcd-font: fix build
NixOS · May 28, 2022 · 812751d · 812751d
2 parents aada3db + 01895ff
commit 812751d
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix
@@ -11,11 +11,22 @@ in fetchFromGitHub {
   rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
 
   postFetch = ''
-    tar xf $downloadedFile --strip=1
+    pushd $out
+
     install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf
     install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf
+
+    # remove unrelated files
+    for f in * .*; do
+      case "$f" in
+        share|.|..) ;;
+        *) rm -rf "$f" ;;
+      esac
+    done
+
+    popd
   '';
-  sha256 = "0xhwa53aiz20763jb9nvbr2zq9k6jl69p07dc4b0apwrrwz0jfr1";
+  sha256 = "sha256-ITsJPs+ZXwUWYe2AmwyVZib8RV7bpiWHOUD8qEZRHHY=";
 
   meta = with lib; {
     description = "The xkcd font";