From 576746970e8fe9232bd34a446321ec7f42c3eb9d Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 1 Feb 2016 08:47:56 +0100 Subject: liberation-fonts: fix meta after 2012 changes /cc maintainer @7c6f434c. --- pkgs/data/fonts/redhat-liberation-fonts/binary.nix | 29 ++-------------------- .../data/fonts/redhat-liberation-fonts/default.nix | 14 +++-------- 2 files changed, 6 insertions(+), 37 deletions(-) (limited to 'pkgs/data/fonts/redhat-liberation-fonts') diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix index df206fe13b5..9cbe951cf4a 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, liberation_ttf_from_source }: stdenv.mkDerivation rec { version = "2.00.1"; @@ -16,30 +16,5 @@ stdenv.mkDerivation rec { cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true ''; - meta = { - description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' - The Liberation Fonts are intended to be replacements for the three most - commonly used fonts on Microsoft systems: Times New Roman, Arial, and - Courier New. - - There are three sets: Sans (a substitute for Arial, Albany, Helvetica, - Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times - New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono - (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and - Bitstream Vera Sans Mono). - - You are free to use these fonts on any system you would like. You are - free to redistribute them under the GPL+exception license found in the - download. Using these fonts does not subject your documents to the - GPL---it liberates them from any proprietary claim. - ''; - - # See `License.txt' for details. - license = stdenv.lib.licenses.gpl2Oss; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ - stdenv.lib.maintainers.raskin - ]; - }; + inherit (liberation_ttf_from_source) meta; } diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index cd5c5030941..80af5ab52d9 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -18,30 +18,24 @@ stdenv.mkDerivation rec { cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true ''; - meta = { + meta = with stdenv.lib; { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; longDescription = '' The Liberation Fonts are intended to be replacements for the three most commonly used fonts on Microsoft systems: Times New Roman, Arial, and - Courier New. + Courier New. Since 2012 they are based on croscore fonts. There are three sets: Sans (a substitute for Arial, Albany, Helvetica, Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and Bitstream Vera Sans Mono). - - You are free to use these fonts on any system you would like. You are - free to redistribute them under the GPL+exception license found in the - download. Using these fonts does not subject your documents to the - GPL---it liberates them from any proprietary claim. ''; - # See `License.txt' for details. - license = stdenv.lib.licenses.gpl2Oss; + license = licenses.ofl; homepage = https://fedorahosted.org/liberation-fonts/; maintainers = [ - stdenv.lib.maintainers.raskin + maintainers.raskin ]; }; } -- cgit 1.4.1