diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:44:05 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:44:05 -0700 |
| commit | 767c179a9440293f259433f6e8bf578176927d72 (patch) | |
| tree | 1902b66023b85f0991d78f4f404bdce12ffb7503 /pkgs/data | |
| parent | 2c8cf45772862e7e2d77086bbaaa6ac0183ea0bf (diff) | |
| parent | 5a2a71f2c2bbefe01f33c8f0542f57b770a065b2 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/fira/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/data/fonts/mplus-outline-fonts/default.nix | 26 |
2 files changed, 30 insertions, 3 deletions
diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 7696632ef92bd..532abd4e58714 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "fira-4.002"; + name = "fira-4.004"; src = fetchurl { - url = http://www.carrois.com/downloads/fira_4_0/FiraFonts4002.zip; - sha256 = "1vh4hx8ffmh2p7mxxbcp5zbcz8kzpzxaggdqnhj5i4vi329n5hfw"; + url = "http://www.carrois.com/downloads/fira_4_0/FiraFonts4004.zip"; + sha256 = "0mab1n4i8ayhzmpfm0dj07annghrfpnsfr2rhnwsyhkk5zxlh6v7"; }; buildInputs = [unzip]; phases = [ "unpackPhase" "installPhase" ]; + sourceRoot = "FiraFonts4004"; installPhase = '' mkdir -p $out/share/fonts/opentype diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix new file mode 100644 index 0000000000000..eefb663f72213 --- /dev/null +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mplus-${version}"; + version = "TESTFLIGHT-059"; + + src = fetchurl { + url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-059.tar.xz"; + sha256 = "09dzdgqqflpijd3c30m38cyidshawfp4nz162xhn91j9w09y2qkq"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "M+ Outline Fonts"; + homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html; + license = licenses.mit; + maintainers = with maintainers; [ henrytill ]; + platforms = platforms.all; + }; +} |