Skip to content

Commit

Permalink
Merge pull request #60195 from marsam/init-xkcd-font
Browse files Browse the repository at this point in the history
xkcd-font: init at 2017-08-24
  • Loading branch information
c0bw3b committed Apr 25, 2019
2 parents 76843da + 6124bfa commit 1746dc2
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 0 deletions.
6 changes: 6 additions & 0 deletions lib/licenses.nix
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
free = false;
};

cc-by-nc-30 = spdx {
spdxId = "CC-BY-NC-3.0";
fullName = "Creative Commons Attribution Non Commercial 3.0 Unported";
free = false;
};

cc-by-nc-40 = spdx {
spdxId = "CC-BY-NC-4.0";
fullName = "Creative Commons Attribution Non Commercial 4.0 International";
Expand Down
28 changes: 28 additions & 0 deletions pkgs/data/fonts/xkcd-font/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub }:

stdenv.mkDerivation rec {
pname = "xkcd-font";
version = "unstable-2017-08-24";

src = fetchFromGitHub {
owner = "ipython";
repo = pname;
rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
sha256 = "01wpfc1yp93b37r472mx2b459il5gywnv5sl7pp9afpycb3i4f6l";
};

phases = [ "unpackPhase" "installPhase" ];

installPhase = ''
install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf
install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf
'';

meta = with stdenv.lib; {
description = "The xkcd font";
homepage = https://github.com/ipython/xkcd-font;
license = licenses.cc-by-nc-30;
platforms = platforms.all;
maintainers = [ maintainers.marsam ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16413,6 +16413,8 @@ in

xits-math = callPackage ../data/fonts/xits-math { };

xkcd-font = callPackage ../data/fonts/xkcd-font { };

xkeyboard_config = xorg.xkeyboardconfig;

xlsx2csv = with python3Packages; toPythonApplication xlsx2csv;
Expand Down

0 comments on commit 1746dc2

Please sign in to comment.