From ef83faadee9c5c77eb1651c8ff57bf795a888e00 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 24 Jan 2023 13:42:24 +0100
Subject: tv iosevka-tv-1: allow using prebuilt font

---
 tv/5pkgs/override/iosevka-tv-1.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 tv/5pkgs/override/iosevka-tv-1.nix

(limited to 'tv/5pkgs/override/iosevka-tv-1.nix')

diff --git a/tv/5pkgs/override/iosevka-tv-1.nix b/tv/5pkgs/override/iosevka-tv-1.nix
new file mode 100644
index 00000000..3b3df6e0
--- /dev/null
+++ b/tv/5pkgs/override/iosevka-tv-1.nix
@@ -0,0 +1,26 @@
+self: super:
+
+let
+  prebuilt =
+    self.stdenv.mkDerivation rec {
+      pname = "iosevka-tv-1";
+      version = "15.6.3";
+      src = self.fetchurl {
+        urls = [
+          "https://c.krebsco.de/iosevka-tv-1-${version}.tar.gz"
+          "https://ni.krebsco.de/~tv/mirrors/iosevka/iosevka-tv-1-${version}.tar.gz"
+        ];
+        sha256 = "0shsvlb1cmn39l33nzd5bj8g0h9jg7rdq8hvlac8qvnzfhpi5s6k";
+      };
+      installPhase = ''
+        mkdir -p $out/share/fonts/truetype
+        mv -v *.ttf $out/share/fonts/truetype
+      '';
+    };
+in
+
+if super.iosevka.version == prebuilt.version then
+  prebuilt
+
+else
+  super.iosevka
-- 
cgit v1.2.3


From 1499d5c3934e873041069d6b84bb4704beb83ead Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 27 Jan 2023 13:08:31 +0100
Subject: tv iosevka 1: streamline package

---
 tv/5pkgs/override/iosevka-tv-1.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tv/5pkgs/override/iosevka-tv-1.nix')

diff --git a/tv/5pkgs/override/iosevka-tv-1.nix b/tv/5pkgs/override/iosevka-tv-1.nix
index 3b3df6e0..99b82d51 100644
--- a/tv/5pkgs/override/iosevka-tv-1.nix
+++ b/tv/5pkgs/override/iosevka-tv-1.nix
@@ -10,11 +10,11 @@ let
           "https://c.krebsco.de/iosevka-tv-1-${version}.tar.gz"
           "https://ni.krebsco.de/~tv/mirrors/iosevka/iosevka-tv-1-${version}.tar.gz"
         ];
-        sha256 = "0shsvlb1cmn39l33nzd5bj8g0h9jg7rdq8hvlac8qvnzfhpi5s6k";
+        hash = "sha256-88OfNUbuNbGx3hFzYZ+gAYgOWZ+A8IYo45I1n/qOyhM=";
       };
       installPhase = ''
-        mkdir -p $out/share/fonts/truetype
-        mv -v *.ttf $out/share/fonts/truetype
+        mkdir $out
+        mv * $out/
       '';
     };
 in
@@ -23,4 +23,4 @@ if super.iosevka.version == prebuilt.version then
   prebuilt
 
 else
-  super.iosevka
+  super.iosevka-tv-1
-- 
cgit v1.2.3


From 08009331800e7fa9c1ac1fae8711750bab1ed950 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 27 Jan 2023 16:17:22 +0100
Subject: tv iosevka: use fetchzip

---
 tv/5pkgs/override/iosevka-tv-1.nix | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

(limited to 'tv/5pkgs/override/iosevka-tv-1.nix')

diff --git a/tv/5pkgs/override/iosevka-tv-1.nix b/tv/5pkgs/override/iosevka-tv-1.nix
index 99b82d51..880160b3 100644
--- a/tv/5pkgs/override/iosevka-tv-1.nix
+++ b/tv/5pkgs/override/iosevka-tv-1.nix
@@ -1,26 +1,20 @@
 self: super:
 
 let
-  prebuilt =
-    self.stdenv.mkDerivation rec {
-      pname = "iosevka-tv-1";
-      version = "15.6.3";
-      src = self.fetchurl {
-        urls = [
-          "https://c.krebsco.de/iosevka-tv-1-${version}.tar.gz"
-          "https://ni.krebsco.de/~tv/mirrors/iosevka/iosevka-tv-1-${version}.tar.gz"
-        ];
-        hash = "sha256-88OfNUbuNbGx3hFzYZ+gAYgOWZ+A8IYo45I1n/qOyhM=";
-      };
-      installPhase = ''
-        mkdir $out
-        mv * $out/
-      '';
-    };
+  srcpkg = super.iosevka-tv-1;
+  binpkg = self.fetchzip {
+    inherit (srcpkg) pname version;
+    stripRoot = false;
+    hash = "sha256-QIuTS70vUQSvDDXjY4uI6SCcu1XT4HjvzpthvrNX4h0=";
+    urls = [
+      "https://c.krebsco.de/${srcpkg.name}.tar.gz"
+      "https://ni.krebsco.de/~tv/mirrors/iosevka/${srcpkg.name}.tar.gz"
+    ];
+  };
 in
 
-if super.iosevka.version == prebuilt.version then
-  prebuilt
+if srcpkg.version == binpkg.version then
+  binpkg
 
 else
-  super.iosevka-tv-1
+  srcpkg
-- 
cgit v1.2.3