Merge pull request #24857 from sphaugh/master

envypn: init at 1.7.1 (+ MirOS license)
This commit is contained in:
Jörg Thalheim 2017-04-13 10:59:18 +02:00 committed by GitHub
commit d8e810e049
3 changed files with 43 additions and 0 deletions

View file

@ -357,6 +357,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Lucent Public License v1.02";
};
miros = {
fullname = "MirOS License";
url = https://opensource.org/licenses/MirOS;
};
# spdx.org does not (yet) differentiate between the X11 and Expat versions
# for details see http://en.wikipedia.org/wiki/MIT_License#Various_versions
mit = spdx {

View file

@ -0,0 +1,36 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
stdenv.mkDerivation rec {
name = "envypn-font-1.7.1";
src = fetchurl {
url = "https://ywstd.fr/files/p/envypn-font/envypn-font-1.7.1.tar.gz";
sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270";
};
buildInputs = [ mkfontdir mkfontscale ];
unpackPhase = ''
tar -xzf $src --strip-components=1
'';
installPhase = ''
# install the pcf fonts (for xorg applications)
fontDir="$out/share/fonts/envypn"
mkdir -p "$fontDir"
mv *.pcf.gz "$fontDir"
cd "$fontDir"
mkfontdir
mkfontscale
'';
meta = with stdenv.lib; {
description = ''
Readable bitmap font inspired by Envy Code R
'';
homepage = "http://ywstd.fr/p/pj/#envypn";
license = licenses.miros;
platforms = platforms.linux;
};
}

View file

@ -12439,6 +12439,8 @@ with pkgs;
encode-sans = callPackage ../data/fonts/encode-sans { };
envypn-font = callPackage ../data/fonts/envypn-font { };
fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {};
fira = callPackage ../data/fonts/fira { };