From f072ce1373104ba695baeab1aa8f91f5219991eb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 21 Nov 2022 04:20:00 +0000
Subject: [PATCH] _3270font: 2.3.1 -> 3.0.1

https://github.com/rbanffy/3270font/releases/tag/v3.0.0
https://github.com/rbanffy/3270font/releases/tag/v3.0.1
---
 pkgs/data/fonts/3270font/default.nix | 35 +++++++++++++++++-----------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/data/fonts/3270font/default.nix
index 914583d97ee..68bdd7e70d4 100644
--- a/pkgs/data/fonts/3270font/default.nix
+++ b/pkgs/data/fonts/3270font/default.nix
@@ -1,19 +1,28 @@
-{ lib, fetchzip }:
-let
-  version = "2.3.1";
-in
-fetchzip {
-  name = "3270font-${version}";
+{ lib, stdenvNoCC, fetchzip }:
 
-  url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_3b8f2fb.zip";
+stdenvNoCC.mkDerivation rec {
+  pname = "3270font";
+  version = "3.0.1";
 
-  sha256 = "06n87ydn2ayfhpg8318chmnwmdk3d4mmy65fcgf8frbiv2kpqncs";
+  src = fetchzip {
+    url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_d916271.zip";
+    sha256 = "sha256-Zi6Lp5+sqfjIaHmnaaemaw3i+hXq9mqIsK/81lTkwfM=";
+    stripRoot = false;
+  };
 
-  postFetch = ''
-    mkdir -p $out/share/fonts/
-    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
-    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
-    unzip -j $downloadedFile \*.afm -d $out/share/fonts/type1
+  dontPatch = true;
+  dontConfigure = true;
+  dontBuild = true;
+  doCheck = false;
+  dontFixup = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 -t $out/share/fonts/opentype/ *.otf
+    install -Dm644 -t $out/share/fonts/truetype/ *.ttf
+
+    runHook postInstall
   '';
 
   meta = with lib; {