Merge pull request #5268 from prikhi/fix-dina-font

dina-font: fix the installPhase
2014-12-11 23:10:23 +01:00 · 2014-12-11 23:10:23 +01:00 · 747488ae66
parent 80e3018bc0 ab012ecdb5
commit 747488ae66
1 changed files with 2 additions and 4 deletions
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@ -13,14 +13,12 @@ stdenv.mkDerivation rec {

  dontBuild = true;
  patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf";
-  preInstall = ''
-    export _get_font_size() {
+  installPhase = ''
+    _get_font_size() {
      _pt=$\{1%.bdf}
      _pt=$\{_pt#*-}
      echo $_pt
    }
-  '';
-  installPhase = ''

    for i in Dina_i400-*.bdf; do
        bdftopcf -t -o DinaItalic$(_get_font_size $i).pcf $i