From c99f686a9317c7c628e3ec12e4fc70105d7b0714 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 10 Sep 2019 17:44:57 -0500
Subject: [PATCH 1/2] bdf2psf: fix /usr/share -> /share, and don't install
 env-vars

(instead install what we want directly)
---
 pkgs/tools/misc/bdf2psf/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index 2f326a1d6ac7..6309587fd52f 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
   unpackPhase = "dpkg-deb -x $src .";
   installPhase = "
     substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl
-    mv usr/bin .
-    cp -r . $out
+    mv usr $out
   ";
 
   meta = with stdenv.lib; {

From 6661c367df39df623208a8d8cc39d4c79ee7836a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 14 Sep 2019 10:26:55 +0200
Subject: [PATCH 2/2] fonts/gohufont: update for outputs change in bdf2psf

---
 pkgs/data/fonts/gohufont/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index 1f861afcf83f..29b4241be92c 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     # convert bdf to psf fonts
     build=$(pwd)
     mkdir psf
-    cd ${bdf2psf}/usr/share/bdf2psf
+    cd ${bdf2psf}/share/bdf2psf
     for i in $bdf/*.bdf; do
       bdf2psf \
         --fb "$i" standard.equivalents \