diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2020-02-14 20:14:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 20:14:52 +0100 |
| commit | b2314a6d01ef141edd19e7ed546e23cb59afa739 (patch) | |
| tree | bb1bbee2a7ac4d86ab47a507b1a65ff01475c512 | |
| parent | 7f50a5c0de729eb950be6f102628794735a519d7 (diff) | |
| parent | dcc8e45dab2f77103166226711c221d851acc049 (diff) | |
| download | nixlib-b2314a6d01ef141edd19e7ed546e23cb59afa739.tar nixlib-b2314a6d01ef141edd19e7ed546e23cb59afa739.tar.gz nixlib-b2314a6d01ef141edd19e7ed546e23cb59afa739.tar.bz2 nixlib-b2314a6d01ef141edd19e7ed546e23cb59afa739.tar.lz nixlib-b2314a6d01ef141edd19e7ed546e23cb59afa739.tar.xz nixlib-b2314a6d01ef141edd19e7ed546e23cb59afa739.tar.zst nixlib-b2314a6d01ef141edd19e7ed546e23cb59afa739.zip | |
Merge pull request #79641 from rnhmjoj/creep
creep: split outputs in out and otb
| -rw-r--r-- | pkgs/data/fonts/creep/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix index bad78e3433e1..90b0d19ae99b 100644 --- a/pkgs/data/fonts/creep/default.nix +++ b/pkgs/data/fonts/creep/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48437d60db84..df7f66009769 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; |