about summary refs log tree commit diff
path: root/pkgs/applications/graphics/f3d/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/graphics/f3d/default.nix')
-rw-r--r--pkgs/applications/graphics/f3d/default.nix15
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix
index dc3b9e4b3a61b..5daaf0e10ef1e 100644
--- a/pkgs/applications/graphics/f3d/default.nix
+++ b/pkgs/applications/graphics/f3d/default.nix
@@ -4,18 +4,24 @@
 , cmake
 , help2man
 , gzip
+# There is a f3d overriden with EGL enabled vtk in top-level/all-packages.nix
+# compiling with EGL enabled vtk will result in f3d running in headless mode
+# See https://github.com/NixOS/nixpkgs/pull/324022. This may change later.
 , vtk_9
 , autoPatchelfHook
 , Cocoa
 , OpenGL
 , python3Packages
+, opencascade-occt
+, assimp
+, fontconfig
 , withManual ? !stdenv.isDarwin
 , withPythonBinding ? false
 }:
 
 stdenv.mkDerivation rec {
   pname = "f3d";
-  version = "2.4.0";
+  version = "2.5.0";
 
   outputs = [ "out" ] ++ lib.optionals withManual [ "man" ];
 
@@ -23,7 +29,7 @@ stdenv.mkDerivation rec {
     owner = "f3d-app";
     repo = "f3d";
     rev = "refs/tags/v${version}";
-    hash = "sha256-mqkPegbGos38S50CoV4Qse9Z4wZ327UmIwmSrrP35uI=";
+    hash = "sha256-Mw40JyXZj+Q4a9dD5UnkUSdUfQGaV92gor8ynn86VJ8=";
   };
 
   nativeBuildInputs = [
@@ -39,6 +45,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     vtk_9
+    opencascade-occt
+    assimp
+    fontconfig
   ] ++ lib.optionals stdenv.isDarwin [
     Cocoa
     OpenGL
@@ -55,6 +64,8 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
     "-DCMAKE_INSTALL_BINDIR=bin"
     "-DF3D_MODULE_EXTERNAL_RENDERING=ON"
+    "-DF3D_PLUGIN_BUILD_ASSIMP=ON"
+    "-DF3D_PLUGIN_BUILD_OCCT=ON"
   ] ++ lib.optionals withManual [
     "-DF3D_LINUX_GENERATE_MAN=ON"
   ] ++ lib.optionals withPythonBinding [