colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79641 from rnhmjoj/creep

Browse Source 
creep: split outputs in out and otb
This commit is contained in:
Michele Guerini Rocco 2020-02-14 20:14:52 +01:00 committed by GitHub
commit b2314a6d01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/data/fonts/creep/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub, fontforge }:
{ stdenv, fetchFromGitHub, libfaketime
, fonttosfnt, mkfontscale
}:
stdenv.mkDerivation rec {
pname = "creep";
@ -11,14 +13,21 @@ stdenv.mkDerivation rec {
sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n";
};
nativeBuildInputs = [ fontforge ];
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
dontBuild = true;
buildPhase = ''
faketime -f "1970-01-01 00:00:01" fonttosfnt -g 2 -m 2 -o creep.otb creep.bdf
'';
installPhase = ''
install -D -m644 creep.bdf "$out/usr/share/fonts/misc/creep.bdf"
install -D -m644 creep.bdf "$out/share/fonts/misc/creep.bdf"
mkfontdir "$out/share/fonts/misc"
install -D -m644 creep.otb "$otb/share/fonts/misc/creep.otb"
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; {
description = "A pretty sweet 4px wide pixel font";
homepage = https://github.com/romeovs/creep;

3
pkgs/top-level/all-packages.nix
View File

@ -17398,7 +17398,8 @@ in
cm_unicode = callPackage ../data/fonts/cm-unicode {};
creep = callPackage ../data/fonts/creep { };
creep = callPackage ../data/fonts/creep
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
crimson = callPackage ../data/fonts/crimson {};