git.iko.soy/typeable/nixpkgs
on master help sign in
raspberrypi-tools: fix build on x86_64-linux

This allows using tools such as dtmerge on x86_64-linux.

commitb1fb82e979b4b97c1517fb606c9106efffcdf3ba authorFlorian Klink <flokli@flokli.de> dateSun 27 Dec 2020, 03:10 (6 years ago) parent1cf1934
1 file changed+10−2
pkgs/os-specific/linux/firmware/raspberrypi/tools.nix+10−2
pkgs/os-specific/linux/firmware/raspberrypi/tools.nix+10−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
1+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig }:
22
33stdenv.mkDerivation {
44 pname = "raspberrypi-tools";
@@ -13,6 +13,14 @@ stdenv.mkDerivation {
1313
1414 nativeBuildInputs = [ cmake pkgconfig ];
1515
16+ patches = [
17+ (fetchpatch {
18+ # https://github.com/raspberrypi/userland/pull/670
19+ url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";
20+ sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";
21+ })
22+ ];
23+
1624 preConfigure = ''
1725 cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out")
1826 '' + stdenv.lib.optionalString stdenv.isAarch64 ''
@@ -23,7 +31,7 @@ stdenv.mkDerivation {
2331 description = "Userland tools for the Raspberry Pi board";
2432 homepage = "https://github.com/raspberrypi/userland";
2533 license = licenses.bsd3;
26− platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
34+ platforms = [ "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
2735 maintainers = with maintainers; [ dezgeg tavyc ];
2836 };
2937}