pyrox.dev
lol
m17n-lib: pull fix pending upstream inclusion for parallel builds
Without the change parallel build sometimes fails as:
make[2]: *** No rule to make target '../src/libm17n-core.la', needed by 'libm17n.la'. Stop.
make[2]: *** Waiting for unfinished jobs....
+13
-5
pkgs/tools/inputmethods/m17n-lib/default.nix
+13
-5
pkgs/tools/inputmethods/m17n-lib/default.nix
···
1
-
{ lib, stdenv, fetchurl, m17n_db, autoreconfHook, pkg-config }:
1
+
{ lib, stdenv, fetchurl, fetchpatch, m17n_db, autoreconfHook, pkg-config }:
2
2
stdenv.mkDerivation rec {
3
3
pname = "m17n-lib";
4
4
version = "1.8.0";
···
8
8
sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq";
9
9
};
10
10
11
+
patches = [
12
+
(fetchpatch {
13
+
# Patch pending upstream inclusion:
14
+
# https://savannah.nongnu.org/bugs/index.php?61377
15
+
name = "parallel-build.patch";
16
+
url = "https://savannah.nongnu.org/bugs/download.php?file_id=53704";
17
+
hash = "sha256-1smKSIFVRJZSwCv0NiUsnndxKcPnJ/wqzH8+ka6nfNM=";
18
+
excludes = [ "src/ChangeLog" ];
19
+
})
20
+
];
21
+
11
22
strictDeps = true;
12
23
13
24
# reconf needed to sucesfully cross-compile
···
17
28
m17n_db
18
29
];
19
30
20
-
# Fails parallel build due to missing intra-package depends:
21
-
# https://savannah.nongnu.org/bugs/index.php?61377
22
-
# make[2]: *** No rule to make target '../src/libm17n-core.la', needed by 'libm17n.la'. Stop.
23
-
enableParallelBuilding = false;
31
+
enableParallelBuilding = true;
24
32
25
33
meta = {
26
34
homepage = "https://www.nongnu.org/m17n/";