pyrox.dev
libblake3: fix FreeBSD cross-compile builds (#401250)
authored by John Ericson and committed by GitHub 03dcb2b3 b974a8a0
+9
pkgs/by-name/li/libblake3/package.nix
+9
pkgs/by-name/li/libblake3/package.nix
···
38
38
tbb_2021_11
39
39
];
40
40
41
+
patches = [
42
+
# build(cmake): Relax Clang frontend variant detection (BLAKE3-team/BLAKE3#477)
43
+
(fetchpatch {
44
+
url = "https://patch-diff.githubusercontent.com/raw/BLAKE3-team/BLAKE3/pull/477.patch";
45
+
hash = "sha256-kidCMGd/i9D9HLLTt7l1DbiU71sFTEyr3Vew4XHUHls=";
46
+
relative = "c";
47
+
})
48
+
];
49
+
41
50
cmakeFlags = [
42
51
(lib.cmakeBool "BLAKE3_USE_TBB" useTBB)
43
52
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+6
-5
pkgs/development/libraries/tbb/2022_0.nix
+6
-5
pkgs/development/libraries/tbb/2022_0.nix
···
34
34
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";
35
35
hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";
36
36
})
37
-
];
38
-
39
-
cmakeFlags = [
40
-
# Skip tests to work around https://github.com/uxlfoundation/oneTBB/issues/1695
41
-
(lib.cmakeBool "TBB_TEST" (!stdenv.hostPlatform.isWindows))
37
+
# Fix tests on FreeBSD and Windows
38
+
(fetchpatch {
39
+
name = "fix-tbb-freebsd-and-windows-tests.patch";
40
+
url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";
41
+
hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";
42
+
})
42
43
];
43
44
44
45
# Fix build with modern gcc
+6
-5
pkgs/development/libraries/tbb/default.nix
+6
-5
pkgs/development/libraries/tbb/default.nix
···
44
44
url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/1193.patch";
45
45
hash = "sha256-ZQbwUmuIZoGVBof8QNR3V8vU385e2X7EvU3+Fbj4+M8=";
46
46
})
47
-
];
48
-
49
-
cmakeFlags = [
50
-
# Skip tests to work around https://github.com/uxlfoundation/oneTBB/issues/1695
51
-
(lib.cmakeBool "TBB_TEST" (!stdenv.hostPlatform.isWindows))
47
+
# Fix tests on FreeBSD and Windows
48
+
(fetchpatch {
49
+
name = "fix-tbb-freebsd-and-windows-tests.patch";
50
+
url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";
51
+
hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";
52
+
})
52
53
];
53
54
54
55
# Fix build with modern gcc