summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorD Anzorge <d.anzorge@gmail.com>2022-11-13 01:01:55 +0100
committerD Anzorge <d.anzorge@gmail.com>2022-11-13 01:01:55 +0100
commitd77b0bb6a5ac11afb379c981d6d484a95b385961 (patch)
treed6713f63aeb5acd3ae488e8d18dda8a096d453f7 /pkgs/data
parent238db8df98a37821158d71e4ea326c1e42746ce6 (diff)
downloadnixpkgs-d77b0bb6a5ac11afb379c981d6d484a95b385961.tar
nixpkgs-d77b0bb6a5ac11afb379c981d6d484a95b385961.tar.gz
nixpkgs-d77b0bb6a5ac11afb379c981d6d484a95b385961.tar.bz2
nixpkgs-d77b0bb6a5ac11afb379c981d6d484a95b385961.tar.lz
nixpkgs-d77b0bb6a5ac11afb379c981d6d484a95b385961.tar.xz
nixpkgs-d77b0bb6a5ac11afb379c981d6d484a95b385961.tar.zst
nixpkgs-d77b0bb6a5ac11afb379c981d6d484a95b385961.zip
montserrat: fix build
Changes needed after fetchzip changes in #173430
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/montserrat/default.nix20
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix
index 7d91f49eb3e..cb396080e49 100644
--- a/pkgs/data/fonts/montserrat/default.nix
+++ b/pkgs/data/fonts/montserrat/default.nix
@@ -1,21 +1,25 @@
 { lib, fetchFromGitHub }:
 
-let
+fetchFromGitHub rec {
   pname = "montserrat";
   version = "7.222";
-in fetchFromGitHub {
-  name = "${pname}-${version}";
+
   owner = "JulietaUla";
   repo = pname;
   rev = "v${version}";
   sha256 = "sha256-MeNnc1e5X5f0JyaLY6fX22rytHkvL++eM2ygsdlGMv0=";
 
   postFetch = ''
-    tar xf $downloadedFile --strip 1
-    install -Dm 444 fonts/otf/*.otf -t $out/share/fonts/otf
-    install -Dm 444 fonts/ttf/*.ttf -t $out/share/fonts/ttf
-    install -Dm 444 fonts/webfonts/*.woff -t $out/share/fonts/woff
-    install -Dm 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2
+    mkdir -p $out/share/fonts/{otf,ttf,woff,woff2}
+
+    mv $out/fonts/otf/*.otf $out/share/fonts/otf
+    mv $out/fonts/ttf/*.ttf $out/share/fonts/ttf
+    mv $out/fonts/webfonts/*.woff $out/share/fonts/woff
+    mv $out/fonts/webfonts/*.woff2 $out/share/fonts/woff2
+
+    shopt -s extglob dotglob
+    rm -rf $out/!(share)
+    shopt -u extglob dotglob
   '';
 
   meta = with lib; {