diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-07-03 11:38:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-03 11:38:42 +0300 |
| commit | 45efe48ea96eaee2bcb449e61f23c601fdeb277b (patch) | |
| tree | b3c1e5fd744431e14794fc28204a399c56e73abf /pkgs | |
| parent | ef138f05997df578d5484a137a0336ae21bc1793 (diff) | |
| parent | 9ec00a91201c1e63d57e089b9bfc689e1bc86ed8 (diff) | |
Merge pull request #241172 from tjni/spyre
spyre: pull in patches to fix build on Darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/security/spyre/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/tools/security/spyre/default.nix b/pkgs/tools/security/spyre/default.nix index 6b86c910f9aeb..3ec659373c7b9 100644 --- a/pkgs/tools/security/spyre/default.nix +++ b/pkgs/tools/security/spyre/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, fetchpatch , pkg-config , yara }: @@ -16,7 +17,22 @@ buildGoModule rec { hash = "sha256-wlGZTMCJE6Ki5/6R6J9EJP06/S125BNNd/jNPYGwKNw="; }; - vendorHash = "sha256-qZkt5WwicDXrExwMT0tCO+FZgClIHhrVtMR8xNsdAaQ="; + patches = [ + # The following two patches come from https://github.com/spyre-project/spyre/pull/75 + # and improve Darwin support. + (fetchpatch { + name = "syscall-to-x-sys-unix.patch"; + url = "https://github.com/spyre-project/spyre/commit/8f08daf030c847de453613eb2eb1befdb7300921.patch"; + hash = "sha256-oy8Y85IubJVQrt0kmGA1hidZapgCw2aB6F/gT7uQ6KA="; + }) + (fetchpatch { + name = "darwin-skip-dir.patch"; + url = "https://github.com/spyre-project/spyre/commit/12dea550bc4f3275f8f406c19216ad140733a6af.patch"; + hash = "sha256-BXLGOshyGnllbkvsbbmdnqvRHwycrjI52oGWBoXXgL0="; + }) + ]; + + vendorHash = "sha256-aoeAnyFotKWWaRZQsgQPwwmhih/1zfL9eBV/2r1VPBM="; nativeBuildInputs = [ pkg-config |