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

openmoji-black,openmoji-color: fix hanging builds

Browse Source 
...by downgrading fontforge.

Fixes https://github.com/NixOS/nixpkgs/issues/167869
This commit is contained in:
Francesco Gazzetta 2022-05-26 22:15:38 +02:00
parent 3798f3c168
commit 6ee6794c8c
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/data/fonts/openmoji/default.nix
View File

@ -1,7 +1,10 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, scfbuild
, fontforge
, libuninameslist
, nodejs
, nodePackages
, python3Packages
@ -14,6 +17,34 @@ let
[ "OpenMoji-Color.ttf" "OpenMoji-Black.ttf" ]
variant;
# With newer fontforge the build hangs, see
# https://github.com/NixOS/nixpkgs/issues/167869
# Patches etc taken from
# https://github.com/NixOS/nixpkgs/commit/69da642a5a9bb433138ba1b13c8d56fb5bb6ec05
fontforge-20201107 = fontforge.overrideAttrs (old: rec {
version = "20201107";
src = fetchFromGitHub {
owner = "fontforge";
repo = "fontforge";
rev = version;
sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc=";
};
patches = [
(fetchpatch {
url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch";
sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg=";
})
(fetchpatch {
url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch";
sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29";
})
];
buildInputs = old.buildInputs ++ [ libuninameslist ];
});
scfbuild-with-fontforge-20201107 = scfbuild.override (old: {
fontforge = fontforge-20201107;
});
in stdenv.mkDerivation rec {
pname = "openmoji";
version = "13.1.0";
@ -26,7 +57,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [
scfbuild
scfbuild-with-fontforge-20201107
nodejs
nodePackages.glob
nodePackages.lodash