colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

liberation-fonts: fix meta after 2012 changes

Browse Source 
/cc maintainer @7c6f434c.
This commit is contained in:
Vladimír Čunát 2016-02-01 08:47:56 +01:00
parent fdd54a9434
commit 576746970e
2 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/data/fonts/redhat-liberation-fonts/binary.nix
View File

@ -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;
}

14
pkgs/data/fonts/redhat-liberation-fonts/default.nix
View File

@ -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
];
};
}