JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #107689 from flokli/raspberrypi-tools-build-x86_64-linux

Browse Source 
raspberrypi-tools: fix build on x86_64-linux
This commit is contained in:
Jörg Thalheim 2020-12-27 06:02:25 +00:00 committed by GitHub
commit a945fdb483
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig }:
stdenv.mkDerivation {
pname = "raspberrypi-tools";
@ -13,6 +13,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkgconfig ];
patches = [
(fetchpatch {
# https://github.com/raspberrypi/userland/pull/670
url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";
sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";
})
];
preConfigure = ''
cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out")
'' + stdenv.lib.optionalString stdenv.isAarch64 ''
@ -23,7 +31,7 @@ stdenv.mkDerivation {
description = "Userland tools for the Raspberry Pi board";
homepage = "https://github.com/raspberrypi/userland";
license = licenses.bsd3;
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
platforms = [ "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
maintainers = with maintainers; [ dezgeg tavyc ];
};
}