diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-01-10 22:34:05 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-01-10 22:36:42 +0100 |
| commit | 6f1aad769f4dab42e9542c079fa43184388b074f (patch) | |
| tree | c07655388027b5ac096c3cf0b6ad1dec41fb18c2 /pkgs | |
| parent | ce705aa9982a402ad88d9c07f3e455d0a57848d1 (diff) | |
| download | nixpkgs-6f1aad769f4dab42e9542c079fa43184388b074f.tar nixpkgs-6f1aad769f4dab42e9542c079fa43184388b074f.tar.gz nixpkgs-6f1aad769f4dab42e9542c079fa43184388b074f.tar.bz2 nixpkgs-6f1aad769f4dab42e9542c079fa43184388b074f.tar.lz nixpkgs-6f1aad769f4dab42e9542c079fa43184388b074f.tar.xz nixpkgs-6f1aad769f4dab42e9542c079fa43184388b074f.tar.zst nixpkgs-6f1aad769f4dab42e9542c079fa43184388b074f.zip | |
Libertine fonts: update and cleanup.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/data/fonts/libertine/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index a0ed5f75797..514690cb0cd 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -1,25 +1,24 @@ -args : with args; -rec { +args: with args; rec { + name = "linux-libertine-5.3.0"; + src = fetchurl { - url = http://downloads.sourceforge.net/linuxlibertine/5.0.0/LinLibertineSRC_2011_05_22.tgz; - sha256 = "1cr0kvvlqrcmaxfl6szfp3m93mcnhmypx33dxmdm3xdxxkab74vg"; + url = mirror://sf/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz; + sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"; }; - buildInputs = [fontforge]; - configureFlags = []; + buildInputs = [ fontforge ]; /* doConfigure should be specified separately */ phaseNames = ["doUnpack" "generateFontsFromSFD" "installFonts"]; - + extraFontForgeCommands = '' ScaleToEm(1000); ''; - doUnpack = fullDepEntry '' - tar xf ${src} - '' ["minInit"]; + doUnpack = lib.fullDepEntry '' + tar xf ${src} + '' ["minInit"]; - name = "linux-libertine-5.0.0"; meta = { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a820350dc9..b59a8a63dea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6519,7 +6519,7 @@ let liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; libertine = builderDefsPackage (import ../data/fonts/libertine) { - inherit fontforge; + inherit fetchurl fontforge lib; }; lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; |