diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 81de83aecef3..f6d98088ef95 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -1,19 +1,21 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, fontforge, pythonPackages, python}: stdenv.mkDerivation rec { - name = "liberation-fonts-1.04"; + name = "liberation-fonts-2.00.1"; src = fetchurl { url = "https://fedorahosted.org/releases/l/i/liberation-fonts/${name}.tar.gz"; - sha256 = "189i6pc4jqhhmsb9shi8afg9af9crpmz9bnlldhqaxavr1bhj38f"; + sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; }; + buildInputs = [ fontforge pythonPackages.fonttools python ]; + installPhase = '' mkdir -p $out/share/fonts/truetype - cp -v *.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}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9c6161c1d16..d731dd9ea0e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8709,8 +8709,9 @@ let kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; - liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; + 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; libertine = builderDefsPackage (import ../data/fonts/libertine) { inherit fetchurl fontforge lib;