alice-vision: obtain compatible nanoflann version using overrideAttrs

NixOS · Sep 20, 2023 · 10bfc04 · 10bfc04
1 parent 3bdd9a0
commit 10bfc04
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 6 deletions.
diff --git a/pkgs/development/libraries/alice-vision/3.0.0.nix b/pkgs/development/libraries/alice-vision/3.0.0.nix
@@ -4,6 +4,8 @@
 , cmake
 , pkg-config
 
+, pkgs
+
 , assimp
 # use the same boost as in cctag here
 , boost179
@@ -15,7 +17,7 @@
 , geogram
 , lemon-graph
 , lz4
-, nanoflann
+#, nanoflann
 , openexr
 , openimageio
 , zlib
@@ -29,6 +31,19 @@
 , enableOpenCV ? true, enableOpenCVContrib ? enableOpenCV, opencv
 }:
 
+let
+  nanoflann_1_4_2 = pkgs.nanoflann.overrideAttrs (
+    oldAttrs: rec {
+      version = "1.4.2";
+      src = fetchFromGitHub {
+        owner = "jlblancoc";
+        repo = "nanoflann";
+        rev = "v${version}";
+        hash = "sha256-znIX1S0mfOqLYPIcyVziUM1asBjENPEAdafLud1CfFI=";
+      };
+    }
+  );
+in
 stdenv.mkDerivation rec {
   pname = "alice-vision";
   version = "3.0.0";
@@ -49,7 +64,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     flann
-    nanoflann
+    nanoflann_1_4_2
     openexr
 
     # Temporary fix until flann 1.9.2 is in Nixpkgs
@@ -89,7 +104,7 @@ stdenv.mkDerivation rec {
   # This speeds up fetching and reduces the source archive size
   postPatch = ''
     rmdir src/dependencies/nanoflann
-    ln -s ${nanoflann} src/dependencies/nanoflann
+    ln -s ${nanoflann_1_4_2} src/dependencies/nanoflann
 
     rm -r src/dependencies/lemon
     rm -r src/dependencies/flann

diff --git a/pkgs/development/libraries/alice-vision/3.1.0.nix b/pkgs/development/libraries/alice-vision/3.1.0.nix
@@ -4,6 +4,8 @@
 , cmake
 , pkg-config
 
+, pkgs
+
 , assimp
 # use the same boost as in cctag here
 , boost179
@@ -15,7 +17,7 @@
 , geogram
 , lemon-graph
 , lz4
-, nanoflann
+#, nanoflann
 , onnxruntime
 , openexr
 , openimageio
@@ -30,6 +32,19 @@
 , enableOpenCV ? true, enableOpenCVContrib ? enableOpenCV, opencv
 }:
 
+let
+  nanoflann_1_4_2 = pkgs.nanoflann.overrideAttrs (
+    oldAttrs: rec {
+      version = "1.4.2";
+      src = fetchFromGitHub {
+        owner = "jlblancoc";
+        repo = "nanoflann";
+        rev = "v${version}";
+        hash = "sha256-znIX1S0mfOqLYPIcyVziUM1asBjENPEAdafLud1CfFI=";
+      };
+    }
+  );
+in
 stdenv.mkDerivation rec {
   pname = "alice-vision";
   version = "3.1.0";
@@ -50,7 +65,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     flann
-    nanoflann
+    nanoflann_1_4_2
     onnxruntime
     openexr
 
@@ -91,7 +106,7 @@ stdenv.mkDerivation rec {
   # This speeds up fetching and reduces the source archive size
   postPatch = ''
     rmdir src/dependencies/nanoflann
-    ln -s ${nanoflann} src/dependencies/nanoflann
+    ln -s ${nanoflann_1_4_2} src/dependencies/nanoflann
 
     rm -r src/dependencies/lemon
     rm -r src/dependencies/flann