Merge pull request #22415 from volth/liberation_ttf_v1

liberation-fonts: init at 1.07.4
This commit is contained in:
Michael Raskin 2017-02-03 22:07:17 +00:00 committed by GitHub
commit 948361522a
4 changed files with 72 additions and 61 deletions

View file

@ -1,20 +0,0 @@
{ stdenv, fetchurl, liberation_ttf_from_source }:
stdenv.mkDerivation rec {
version = "2.00.1";
name = "liberation-fonts-${version}";
src = fetchurl {
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
};
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
mkdir -p "$out/doc/${name}"
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
'';
inherit (liberation_ttf_from_source) meta;
}

View file

@ -1,18 +1,19 @@
{stdenv, fetchurl, fontforge, pythonPackages, python}:
stdenv.mkDerivation rec {
name = "liberation-fonts-2.00.1";
let
common =
{version, url, sha256, buildInputs}:
stdenv.mkDerivation rec {
name = "liberation-fonts-${version}";
src = fetchurl {
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz";
sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
inherit url sha256;
};
buildInputs = [ fontforge pythonPackages.fonttools python ];
inherit buildInputs;
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp -v $(find . -name '*.ttf') $out/share/fonts/truetype
cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
mkdir -p "$out/doc/${name}"
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
@ -39,4 +40,31 @@ stdenv.mkDerivation rec {
];
platforms = platforms.unix;
};
};
in {
liberation_ttf_v1_from_source = common rec {
version = "1.07.4";
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${version}.tar.gz";
sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d";
buildInputs = [ fontforge pythonPackages.fonttools python ];
};
liberation_ttf_v1_binary = common rec {
version = "1.07.4";
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1";
buildInputs = [ ];
};
liberation_ttf_v2_from_source = common rec {
version = "2.00.1";
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${version}.tar.gz";
sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
buildInputs = [ fontforge pythonPackages.fonttools python ];
};
liberation_ttf_v2_binary = common rec {
version = "2.00.1";
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
buildInputs = [ ];
};
}

View file

@ -1,6 +1,6 @@
{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby
, openssl, quartz-wm, fontconfig, xlsfonts, xfontsel
, ttf_bitstream_vera, freefont_ttf, liberation_ttf_binary
, ttf_bitstream_vera, freefont_ttf, liberation_ttf
, shell ? "${bashInteractive}/bin/bash"
}:
@ -64,7 +64,7 @@ let
xorg.fontbhlucidatypewriter75dpi
ttf_bitstream_vera
freefont_ttf
liberation_ttf_binary
liberation_ttf
xorg.fontbh100dpi
xorg.fontmiscmisc
xorg.fontcursormisc

View file

@ -12126,9 +12126,12 @@ with pkgs;
league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {};
liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { };
liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { };
liberation_ttf = liberation_ttf_binary;
inherit (callPackages ../data/fonts/redhat-liberation-fonts { })
liberation_ttf_v1_from_source
liberation_ttf_v1_binary
liberation_ttf_v2_from_source
liberation_ttf_v2_binary;
liberation_ttf = liberation_ttf_v2_binary;
liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { };
liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { };