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

Merge pull request #191562 from trofi/m17n-lib-fix-parallel-build

Browse Source 
m17n-lib: pull fix pending upstream inclusion for parallel builds
This commit is contained in:
Sergei Trofimovich 2022-09-22 22:13:06 +01:00 committed by GitHub
commit 6aeaeb83b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/inputmethods/m17n-lib/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, m17n_db, autoreconfHook, pkg-config }:
{ lib, stdenv, fetchurl, fetchpatch, m17n_db, autoreconfHook, pkg-config }:
stdenv.mkDerivation rec {
pname = "m17n-lib";
version = "1.8.0";
@ -8,6 +8,17 @@ stdenv.mkDerivation rec {
sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq";
};
patches = [
(fetchpatch {
# Patch pending upstream inclusion:
# https://savannah.nongnu.org/bugs/index.php?61377
name = "parallel-build.patch";
url = "https://savannah.nongnu.org/bugs/download.php?file_id=53704";
hash = "sha256-1smKSIFVRJZSwCv0NiUsnndxKcPnJ/wqzH8+ka6nfNM=";
excludes = [ "src/ChangeLog" ];
})
];
strictDeps = true;
# reconf needed to sucesfully cross-compile
@ -17,10 +28,7 @@ stdenv.mkDerivation rec {
m17n_db
];
# Fails parallel build due to missing intra-package depends:
# https://savannah.nongnu.org/bugs/index.php?61377
# make[2]: *** No rule to make target '../src/libm17n-core.la', needed by 'libm17n.la'. Stop.
enableParallelBuilding = false;
enableParallelBuilding = true;
meta = {
homepage = "https://www.nongnu.org/m17n/";