libraspberrypi: build all binaries on 32-bit ARM
This package included a patch which accidently disabled the applications which can only be built for 32-bit ARM on all platforms (including 32-bit ARM). There is a newer version of the patch available in the upstream PR which can avoid this problem, but I don't think the patch is truly necessary at all. We can simply pass -DARM64=ON on all platforms except 32-bit ARM to get the same effect.
This commit is contained in:
parent
10dd9d85ca
commit
89afe70679
|
@ -16,17 +16,11 @@ stdenv.mkDerivation rec {
|
||||||
hash = "sha512-f7tBgIykcIdkwcFjBKk5ooD/5Bsyrd/0OFr7LNCwWFYeE4DH3XA7UR7YjArkwqUVCVBByr82EOaacw0g1blOkw==";
|
hash = "sha512-f7tBgIykcIdkwcFjBKk5ooD/5Bsyrd/0OFr7LNCwWFYeE4DH3XA7UR7YjArkwqUVCVBByr82EOaacw0g1blOkw==";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
# https://github.com/raspberrypi/userland/pull/670
|
|
||||||
url = "https://github.com/raspberrypi/userland/commit/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";
|
|
||||||
sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
(if (stdenv.hostPlatform.isAarch64) then "-DARM64=ON" else "-DARM64=OFF")
|
# -DARM64=ON disables all targets that only build on 32-bit ARM; this allows
|
||||||
|
# the package to build on aarch64 and other architectures
|
||||||
|
"-DARM64=${if stdenv.hostPlatform.isAarch32 then "OFF" else "ON"}"
|
||||||
"-DVMCS_INSTALL_PREFIX=${placeholder "out"}"
|
"-DVMCS_INSTALL_PREFIX=${placeholder "out"}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue