From f0660185cb669fa8635653904ccef27f3fe2cb45 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 2 Jun 2021 01:15:33 +0200
Subject: tv overrides input-fonts: use fetchzip

---
 tv/5pkgs/override/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tv/5pkgs/override')

diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix
index e6aae0f26..3f76a4c6e 100644
--- a/tv/5pkgs/override/default.nix
+++ b/tv/5pkgs/override/default.nix
@@ -8,10 +8,12 @@ self: super: {
     '';
   });
   input-fonts = super.input-fonts.overrideAttrs (old: rec {
-    src = self.fetchurl {
+    src = self.fetchzip {
       url = "http://xu.r/~tv/mirrors/input-fonts/Input-Font-2.zip";
-      sha256 = "1vvipqcflz4ximy7xpqy9idrdpq3a0c490hp5137r2dq03h865y0";
+      sha256 = "1q58x92nm7dk9ylp09pvgj74nxkywvqny3xmfighnsl30dv42fcr";
+      stripRoot = false;
     };
+    sourceRoot = null;
     outputHash = null;
     outputHashAlgo = null;
     outputHashMode = null;
-- 
cgit v1.2.3


From 1132a21b94423535a75ee80daafc8afd7a43d30b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 2 Jun 2021 00:18:10 +0200
Subject: tv fzf: allow unset patchPhase

For nixpkgs 21.05
---
 tv/5pkgs/override/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/5pkgs/override')

diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix
index 3f76a4c6e..4fb2e8061 100644
--- a/tv/5pkgs/override/default.nix
+++ b/tv/5pkgs/override/default.nix
@@ -4,7 +4,7 @@ self: super: {
     # XXX cannot use `patches` because fzf has a custom patchPhase
     patchPhase = ''
       patch -Np1 < ${./fzf.complete1.patch}
-      ${old.patchPhase}
+      ${old.patchPhase or ""}
     '';
   });
   input-fonts = super.input-fonts.overrideAttrs (old: rec {
-- 
cgit v1.2.3