Merge pull request #68747 from dtzWill/fix/bdf2psf-usr-env-vars

bdf2psf: fix /usr/share -> /share, and don't install env-vars
2019-10-12 15:19:00 +02:00 · 2019-10-12 15:19:00 +02:00 · 98b74470ef
commit 98b74470ef
parent 94500c93dc 6661c367df
2 changed files with 2 additions and 3 deletions
--- 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 \
--- 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; {