From c0301968f7bf68561392991ad32fffa4d0f527d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Jul 2024 12:25:47 +0000 Subject: [PATCH 1/5] python311Packages.f3d: 2.4.0 -> 2.5.0 --- pkgs/applications/graphics/f3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index dc3b9e4b3a61..2c5f76cb5d9e 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "f3d"; - version = "2.4.0"; + version = "2.5.0"; outputs = [ "out" ] ++ lib.optionals withManual [ "man" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "f3d-app"; repo = "f3d"; rev = "refs/tags/v${version}"; - hash = "sha256-mqkPegbGos38S50CoV4Qse9Z4wZ327UmIwmSrrP35uI="; + hash = "sha256-Mw40JyXZj+Q4a9dD5UnkUSdUfQGaV92gor8ynn86VJ8="; }; nativeBuildInputs = [ From c6be11a95f68b2c17403b9b9e22227152451f91e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 7 Jul 2024 22:53:49 +0200 Subject: [PATCH 2/5] vtk: add option enableEgl --- pkgs/development/libraries/vtk/generic.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 5ad312c1b865..d131fe173ab8 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -3,6 +3,7 @@ , fetchpatch , enableQt ? false, qtx11extras, qttools, qtdeclarative, qtEnv , enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given." +, enableEgl ? false # Darwin support , AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL , ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc @@ -15,7 +16,9 @@ let pythonMajor = lib.substring 0 1 python.pythonVersion; in stdenv.mkDerivation { - pname = "vtk${optionalString enableQt "-qvtk"}"; + pname = "vtk" + + optionalString enableEgl "-egl" + + optionalString enableQt "-qvtk"; inherit version; src = fetchurl { @@ -82,7 +85,7 @@ in stdenv.mkDerivation { "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" - "-DVTK_OPENGL_HAS_EGL=ON" + (lib.cmakeBool "VTK_OPENGL_HAS_EGL" enableEgl) ] ++ [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" @@ -113,6 +116,7 @@ in stdenv.mkDerivation { homepage = "https://www.vtk.org/"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp tfmoraes ]; - platforms = with platforms; unix; + platforms = platforms.unix; + badPlatforms = optionals enableEgl platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6e318517ce8..9ee8a49af6cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24639,6 +24639,9 @@ with pkgs; vtk_9_withQt5 = vtk_9.override { enableQt = true; }; vtk = vtk_9; + + vtk_9_egl = vtk_9.override { enableEgl = true; }; + vtkWithQt5 = vtk_9_withQt5; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; From 524fe384051876447ba549f5a11c2e6ffcbbfed2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 7 Jul 2024 22:54:01 +0200 Subject: [PATCH 3/5] f3d: set vtk enableEgl --- pkgs/applications/graphics/f3d/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+) diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 2c5f76cb5d9e..ee6a830246d7 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -4,6 +4,9 @@ , 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ee8a49af6cf..a976be5bcae6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5126,6 +5126,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; + f3d_egl = f3d.override { vtk_9 = vtk_9_egl; }; + facedetect = callPackage ../tools/graphics/facedetect { }; faketty = callPackage ../tools/misc/faketty { }; From 1cddcbecb13de8b030184aa3234bf2b2a8359c13 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 10 Jul 2024 20:12:14 +0800 Subject: [PATCH 4/5] python3Packages.f3d_egl: init --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 729f73f94e6d..271a54d1c775 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4094,6 +4094,11 @@ self: super: with self; { python3Packages = self; }); + f3d_egl = toPythonModule (pkgs.f3d_egl.override { + withPythonBinding = true; + python3Packages = self; + }); + f5-icontrol-rest = callPackage ../development/python-modules/f5-icontrol-rest { }; f5-sdk = callPackage ../development/python-modules/f5-sdk { }; From 03de000c7ee657217e05f336221945aa3b544c9c Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 10 Jul 2024 20:12:44 +0800 Subject: [PATCH 5/5] exhibit: use f3d with egl --- pkgs/by-name/ex/exhibit/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ex/exhibit/package.nix b/pkgs/by-name/ex/exhibit/package.nix index 79b0f4742ea4..73fe81102632 100644 --- a/pkgs/by-name/ex/exhibit/package.nix +++ b/pkgs/by-name/ex/exhibit/package.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ pygobject3 - f3d + f3d_egl ]; dontWrapGApps = true;