From a3ba62db23554247eb13b86ba87b3fe93bf136d3 Mon Sep 17 00:00:00 2001 From: endgame Date: Sun, 30 Sep 2018 05:49:37 +1000 Subject: [PATCH] ultimate-oldschool-pc-font-pack: simplify using fetchzip (#47313) --- .../default.nix | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix index cb68c30a4a2c..f8df39c95652 100644 --- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix +++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "ultimate-oldschool-pc-font-pack-${version}"; +let version = "1.0"; +in +fetchzip rec { + name = "ultimate-oldschool-pc-font-pack-${version}"; + url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip"; + sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y"; - src = fetchurl { - url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip"; - sha256 = "7666cf23176e34ea03a218b5c1500f4ad729d97150ab7bdb7cf2adf4c99a9a7a"; - }; - - buildInputs = [ unzip ]; - - dontBuild = true; - - sourceRoot = "."; - - installPhase = '' + postFetch= '' mkdir -p $out/share/fonts/truetype - cp 'Px437 (TrueType - DOS charset)'/*.ttf $out/share/fonts/truetype - cp 'PxPlus (TrueType - extended charset)'/*.ttf $out/share/fonts/truetype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; meta = with stdenv.lib; {