diff options
| author | Zhaofeng Li <hello@zhaofeng.li> | 2022-05-06 00:22:46 -0700 |
|---|---|---|
| committer | Zhaofeng Li <hello@zhaofeng.li> | 2022-05-27 15:18:45 -0700 |
| commit | 31cb3f9908a31e6c3ba88b38c675f533fc0d5aae (patch) | |
| tree | 7174496acdc75c0626788c343a9f2f81316f99ba /pkgs/misc | |
| parent | 6c4bfe583c0bb74ff62e29bce3818654242667ad (diff) | |
infnoise: Add patch to fix build on aarch64-linux
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/drivers/infnoise/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/misc/drivers/infnoise/makefile.patch | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/misc/drivers/infnoise/default.nix b/pkgs/misc/drivers/infnoise/default.nix index 5bc32ba1ca028..6353b27917630 100644 --- a/pkgs/misc/drivers/infnoise/default.nix +++ b/pkgs/misc/drivers/infnoise/default.nix @@ -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" ''; diff --git a/pkgs/misc/drivers/infnoise/makefile.patch b/pkgs/misc/drivers/infnoise/makefile.patch index b38519036d2c3..871a6c508ce65 100644 --- a/pkgs/misc/drivers/infnoise/makefile.patch +++ b/pkgs/misc/drivers/infnoise/makefile.patch @@ -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) |