Bump trident

knowsys · Jun 12, 2024 · 496b2b0 · 496b2b0
1 parent 39af4a9
commit 496b2b0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/nix/pkgs/trident/default.nix b/nix/pkgs/trident/default.nix
@@ -13,12 +13,12 @@
 }:
 stdenv.mkDerivation {
   pname = "trident";
-  version = "unstable-2022-11-25";
+  version = "unstable-2023-07-19";
   src = pkgs.fetchFromGitHub {
     owner = "karmaresearch";
     repo = "trident";
-    rev = "6665f4465451478119721337f65b128f868f2362";
-    sha256 = "kcITwU1dVbB/sov7ZzkknSczLtTxWD9HfyFSIOOx9ak=";
+    rev = "621ed49c648c811d5f69617833539f419766d3be";
+    hash = "sha256-J/8xlMjC99EOg/Os7/859hnnRr0Z+W8G68FQ2L4iwiE=";
   };
 
   buildInputs = [zlib sparsehash lz4];
@@ -32,7 +32,10 @@ stdenv.mkDerivation {
     "-DKOGNAC_INC=${kognac}/share/include"
   ];
   # this patch forces CMake to prefer our provided lz4 library.
-  patches = [./patches/trident-lz4.patch];
+  patches = [
+    ./patches/trident-lz4.patch
+    ./patches/trident-cstdint.patch
+  ];
 
   installPhase = ''
     runHook preInstall

diff --git a/nix/pkgs/trident/patches/trident-cstdint.patch b/nix/pkgs/trident/patches/trident-cstdint.patch
@@ -0,0 +1,24 @@
+From 4ee17b81f510c72156737896f8f1c15620dd97ca Mon Sep 17 00:00:00 2001
+From: Maximilian Marx <mmarx@wh2.tu-dresden.de>
+Date: Wed, 12 Jun 2024 14:57:18 +0200
+Subject: [PATCH 2/2] Fix missing include
+
+---
+ include/trident/utils/fft.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/trident/utils/fft.h b/include/trident/utils/fft.h
+index 3919904..bdd9861 100644
+--- a/include/trident/utils/fft.h
++++ b/include/trident/utils/fft.h
+@@ -2,6 +2,7 @@
+ #define _FFT_H
+
+ #include <cmath>
++#include <cstdint>
+ typedef struct Complex {
+
+     public:
+-- 
+2.44.1
+