infnoise: Add patch to fix build on aarch64-linux
This commit is contained in:
parent
6c4bfe583c
commit
31cb3f9908
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, libftdi
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, libftdi
|
||||
, infnoise, testers }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -12,18 +12,27 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-9MKG1InkV+yrQPBTgi2gZJ3y9Fokb6WbxuAnM7n7FyA=";
|
||||
};
|
||||
|
||||
# Patch makefile so we can set defines from the command line instead of it depending on .git
|
||||
patches = [ ./makefile.patch ];
|
||||
patches = [
|
||||
# Patch makefile so we can set defines from the command line instead of it depending on .git
|
||||
./makefile.patch
|
||||
|
||||
# Fix getc return type
|
||||
(fetchpatch {
|
||||
url = "https://github.com/leetronics/infnoise/commit/7ed7014e14253311c07e530c8f89f1c8f4705c2b.patch";
|
||||
sha256 = "sha256-seB/fJaxQ/rXJp5iPtnobXXOccQ2KUAk6HFx31dhOhs=";
|
||||
})
|
||||
];
|
||||
|
||||
GIT_COMMIT = src.rev;
|
||||
GIT_VERSION = version;
|
||||
GIT_DATE = "2019-08-12";
|
||||
|
||||
buildInputs = [ libftdi ];
|
||||
|
||||
sourceRoot = "source/software";
|
||||
makefile = "Makefile.linux";
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
postPatch = ''
|
||||
cd software
|
||||
substituteInPlace init_scripts/infnoise.service --replace "/usr/local" "$out"
|
||||
'';
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff --git a/software/Makefile.linux b/software/Makefile.linux
|
||||
index db48aa5..df8b3d2 100644
|
||||
--- a/Makefile.linux
|
||||
+++ b/Makefile.linux
|
||||
--- a/software/Makefile.linux
|
||||
+++ b/software/Makefile.linux
|
||||
@@ -1,6 +1,6 @@
|
||||
-GIT_VERSION := $(shell git --no-pager describe --tags --always)
|
||||
-GIT_COMMIT := $(shell git rev-parse --verify HEAD)
|
||||
|
Loading…
Reference in New Issue
Block a user