From c4affbb17c52b8711ac2a3f2c0e844af3bc52b25 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Tue, 15 Jul 2014 13:35:22 -0400 Subject: [PATCH 1/2] Package for Open Sans fonts. --- pkgs/data/fonts/opensans/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/data/fonts/opensans/default.nix diff --git a/pkgs/data/fonts/opensans/default.nix b/pkgs/data/fonts/opensans/default.nix new file mode 100644 index 00000000000..2e0f3d5df2a --- /dev/null +++ b/pkgs/data/fonts/opensans/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl}: + +# adapted from https://aur.archlinux.org/packages/tt/ttf-opensans/PKGBUILD + +stdenv.mkDerivation rec { + name = "opensans-ttf-20140617"; + + src = fetchurl { + url = "https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz"; + sha256 = "1ycn39dijhd3lffmafminrnfmymdig2jvc6i47bb42fx777q97q4"; + }; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = { + description = "Open Sans fonts"; + + longDescription = '' + Open Sans is a humanist sans serif typeface designed by Steve Matteson, + Type Director of Ascender Corp. + ''; + + homepage = "http://en.wikipedia.org/wiki/Open_Sans"; + license = "Apache"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0836c0f082b..4d4fbfce3ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7985,6 +7985,8 @@ let oldstandard = callPackage ../data/fonts/oldstandard { }; + opensans = callPackage ../data/fonts/opensans { }; + poly = callPackage ../data/fonts/poly { }; posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; From 2faad96991f06fd737e546ab297b3bc7f0edc8c9 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Wed, 16 Jul 2014 16:22:47 -0400 Subject: [PATCH 2/2] Consistently use the package name opensans-ttf everywhere. --- pkgs/data/fonts/{opensans => opensans-ttf}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/data/fonts/{opensans => opensans-ttf}/default.nix (100%) diff --git a/pkgs/data/fonts/opensans/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix similarity index 100% rename from pkgs/data/fonts/opensans/default.nix rename to pkgs/data/fonts/opensans-ttf/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d4fbfce3ba..708bdd87d99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7985,7 +7985,7 @@ let oldstandard = callPackage ../data/fonts/oldstandard { }; - opensans = callPackage ../data/fonts/opensans { }; + opensans_ttf = callPackage ../data/fonts/opensans-ttf { }; poly = callPackage ../data/fonts/poly { };