summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-05-28 00:14:23 +0000
committerGitHub <noreply@github.com>2022-05-28 00:14:23 +0000
commitf1c18d7ae40e7f9852267fa3e10b13a7eecb15a7 (patch)
tree14854dfb34eb02b038b260e1a100ec24e46098d1 /pkgs/data
parent317651b87240bf0d89d4f7d507cbe0d6a073f2f9 (diff)
parentdbd004ea9bee830402aa410c6b8a0a493efa454b (diff)
downloadnixpkgs-f1c18d7ae40e7f9852267fa3e10b13a7eecb15a7.tar
nixpkgs-f1c18d7ae40e7f9852267fa3e10b13a7eecb15a7.tar.gz
nixpkgs-f1c18d7ae40e7f9852267fa3e10b13a7eecb15a7.tar.bz2
nixpkgs-f1c18d7ae40e7f9852267fa3e10b13a7eecb15a7.tar.lz
nixpkgs-f1c18d7ae40e7f9852267fa3e10b13a7eecb15a7.tar.xz
nixpkgs-f1c18d7ae40e7f9852267fa3e10b13a7eecb15a7.tar.zst
nixpkgs-f1c18d7ae40e7f9852267fa3e10b13a7eecb15a7.zip
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/xkcd-font/default.nix15
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix
index af740e40898..af79e7f1d8f 100644
--- 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";