diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix new file mode 100644 index 00000000000..57f463ba64c --- /dev/null +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "ttf-bitstream-vera-1.10"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; + sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv"; + }; + buildPhase = "true"; + installPhase = " + fontDir=$out/share/fonts/truetype + ensureDir $fontDir + cp *.ttf $fontDir + "; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c3634b0f9a5..a9fc6de201f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -212,7 +212,7 @@ rec { url = http://nix.cs.uu.nl/dist/tarballs/font-bh-100dpi-X11R7.0-1.0.0.tar.bz2; md5 = "29eeed0ad42653f27b929119581deb3e"; }; - buildInputs = [pkgconfig fontutil ]; + buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale fontutil ]; }) // {inherit fontutil ;}; fontbh75dpi = (stdenv.mkDerivation { @@ -222,7 +222,7 @@ rec { url = http://nix.cs.uu.nl/dist/tarballs/font-bh-75dpi-X11R7.0-1.0.0.tar.bz2; md5 = "7546c97560eb325400365adbc426308b"; }; - buildInputs = [pkgconfig fontutil ]; + buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale fontutil ]; }) // {inherit fontutil ;}; fontbhlucidatypewriter100dpi = (stdenv.mkDerivation { @@ -232,7 +232,7 @@ rec { url = http://nix.cs.uu.nl/dist/tarballs/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0.tar.bz2; md5 = "8a56f4cbea74f4dbbf9bdac95686dca8"; }; - buildInputs = [pkgconfig fontutil ]; + buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale fontutil ]; }) // {inherit fontutil ;}; fontbhlucidatypewriter75dpi = (stdenv.mkDerivation { @@ -242,7 +242,7 @@ rec { url = http://nix.cs.uu.nl/dist/tarballs/font-bh-lucidatypewriter-75dpi-X11R7.0-1.0.0.tar.bz2; md5 = "e5cccf93f4f1f793cd32adfa81cc1b40"; }; - buildInputs = [pkgconfig fontutil ]; + buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale fontutil ]; }) // {inherit fontutil ;}; fontbhttf = (stdenv.mkDerivation { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9233f80ff68..4acb886ecc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2400,6 +2400,10 @@ rec { inherit fetchurl stdenv; }; + ttf_bitstream_vera = import ../data/fonts/ttf-bitstream-vera { + inherit fetchurl stdenv; + }; + ### APPLICATIONS