mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #190386 from zhaofengli/more-fetchzip-fallouts
Fix more fetchzip fallouts
This commit is contained in:
commit
607bb74fad
3 changed files with 13 additions and 6 deletions
|
@ -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; {
|
||||
|
|
|
@ -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";
|
||||
|
||||
|
|
|
@ -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; {
|
||||
|
|
Loading…
Reference in a new issue