Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1548439
2019-10-13 13:31:33 +02:00
parent 26ec15c267 7818f30cc4
commit b5697c6954
129 changed files with 2555 additions and 1217 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 \