pyrox.dev
Merge pull request #190386 from zhaofengli/more-fetchzip-fallouts
Fix more fetchzip fallouts
+4
-2
pkgs/data/fonts/atkinson-hyperlegible/default.nix
+4
-2
pkgs/data/fonts/atkinson-hyperlegible/default.nix
···
12
12
sha256 = "sha256-urSTqC3rfDRM8IMG+edwKEe7NPiTuDZph3heGHzLDks=";
13
13
14
14
postFetch = ''
15
-
tar xf $downloadedFile --strip=1
16
-
install -Dm644 -t $out/share/fonts/opentype fonts/otf/*
15
+
install -Dm644 -t $out/share/fonts/opentype $out/fonts/otf/*
16
+
shopt -s extglob dotglob
17
+
rm -rf $out/!(share)
18
+
shopt -u extglob dotglob
17
19
'';
18
20
19
21
meta = with lib; {
+5
-2
pkgs/data/fonts/hermit/default.nix
+5
-2
pkgs/data/fonts/hermit/default.nix
···
8
8
9
9
url = "https://pcaro.es/d/otf-${name}.tar.gz";
10
10
11
+
stripRoot = false;
11
12
postFetch = ''
12
-
tar xf $downloadedFile
13
-
install -m444 -Dt $out/share/fonts/opentype *.otf
13
+
install -m444 -Dt $out/share/fonts/opentype $out/*.otf
14
+
shopt -s extglob dotglob
15
+
rm -rf $out/!(share)
16
+
shopt -u extglob dotglob
14
17
'';
15
18
sha256 = "127hnpxicqya7v1wmzxxqafq3aj1n33i4j5ncflbw6gj5g3bizwl";
16
19
+4
-2
pkgs/data/misc/publicsuffix-list/default.nix
+4
-2
pkgs/data/misc/publicsuffix-list/default.nix
···
11
11
sha256 = "sha256-Q8uIXM1CMu8dlWcVoL17M1XRGu3kG7Y7jpx0oHQh+2I=";
12
12
13
13
postFetch = ''
14
-
tar xf $downloadedFile --strip=1
15
-
install -Dm0444 public_suffix_list.dat tests/test_psl.txt -t $out/share/publicsuffix
14
+
install -Dm0444 $out/public_suffix_list.dat $out/tests/test_psl.txt -t $out/share/publicsuffix
15
+
shopt -s extglob dotglob
16
+
rm -rf $out/!(share)
17
+
shopt -u extglob dotglob
16
18
'';
17
19
18
20
meta = with lib; {