Merge pull request #200778 from lopsided98/libraspberrypi-all-binaries

libraspberrypi: build all binaries on 32-bit ARM

authored by Florian Klink and committed by GitHub 7c67f006 8d73becb

+3 -9
+3 -9
pkgs/development/libraries/libraspberrypi/default.nix
··· 16 16 hash = "sha512-f7tBgIykcIdkwcFjBKk5ooD/5Bsyrd/0OFr7LNCwWFYeE4DH3XA7UR7YjArkwqUVCVBByr82EOaacw0g1blOkw=="; 17 17 }; 18 18 19 - patches = [ 20 - (fetchpatch { 21 - # https://github.com/raspberrypi/userland/pull/670 22 - url = "https://github.com/raspberrypi/userland/commit/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch"; 23 - sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw"; 24 - }) 25 - ]; 26 - 27 19 nativeBuildInputs = [ cmake pkg-config ]; 28 20 cmakeFlags = [ 29 - (if (stdenv.hostPlatform.isAarch64) then "-DARM64=ON" else "-DARM64=OFF") 21 + # -DARM64=ON disables all targets that only build on 32-bit ARM; this allows 22 + # the package to build on aarch64 and other architectures 23 + "-DARM64=${if stdenv.hostPlatform.isAarch32 then "OFF" else "ON"}" 30 24 "-DVMCS_INSTALL_PREFIX=${placeholder "out"}" 31 25 ]; 32 26