pyrox.dev
lol
x264: pull upstream parallel build fix
Without the change parallel builds occasionally fail as:
$ make --shuffle
...
gcc ... -c common/opencl.c -o common/opencl-8.o ...
common/opencl.c:116:10: fatal error: common/oclobj.h: No such file or directory
116 | #include "common/oclobj.h"
| ^~~~~~~~~~~~~~~~~
+10
-2
pkgs/development/libraries/x264/default.nix
+10
-2
pkgs/development/libraries/x264/default.nix
···
1
-
{ stdenv, lib, fetchFromGitLab, nasm
1
+
{ stdenv, lib, fetchFromGitLab, fetchpatch, nasm
2
2
, enableShared ? !stdenv.hostPlatform.isStatic
3
3
}:
4
4
···
16
16
17
17
# Upstream ./configure greps for (-mcpu|-march|-mfpu) in CFLAGS, which in nix
18
18
# is put in the cc wrapper anyway.
19
-
patches = [ ./disable-arm-neon-default.patch ];
19
+
patches = [
20
+
./disable-arm-neon-default.patch
21
+
(fetchpatch {
22
+
# https://code.videolan.org/videolan/x264/-/merge_requests/114
23
+
name = "fix-parallelism.patch";
24
+
url = "https://code.videolan.org/videolan/x264/-/commit/e067ab0b530395f90b578f6d05ab0a225e2efdf9.patch";
25
+
hash = "sha256-16h2IUCRjYlKI2RXYq8QyXukAdfoQxyBKsK/nI6vhRI=";
26
+
})
27
+
];
20
28
21
29
postPatch = ''
22
30
patchShebangs .