From ca122e0bb57ba90ac241a1633930b80d66a8eebc Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 12 Oct 2025 04:09:38 +0800 Subject: [PATCH 1/4] coin3d: 4.0.5 -> 4.0.6 --- pkgs/by-name/co/coin3d/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix index 3e3d42799c5c..aa362b81e5e9 100644 --- a/pkgs/by-name/co/coin3d/package.nix +++ b/pkgs/by-name/co/coin3d/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coin"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "coin3d"; repo = "coin"; rev = "v${finalAttrs.version}"; - hash = "sha256-2lfy33Qx0AjKDfwwRn7hjaz7mPQsr7MRB9v75qshGjM="; + hash = "sha256-XBkb8CbfAXBwOO9JkExpsy8HxtbZo3/fnU6cReuSETI="; }; nativeBuildInputs = [ cmake ]; @@ -29,8 +29,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux libX11; - cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ]; - meta = with lib; { homepage = "https://github.com/coin3d/coin"; description = "High-level, retained-mode toolkit for effective 3D graphics development"; From aee49ac9acc63c424534e21e2f806c46651dac7a Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 12 Oct 2025 01:24:38 +0800 Subject: [PATCH 2/4] freecad: remove redundant cmakeFlags --- pkgs/by-name/fr/freecad/package.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 23323780e849..da621c72a08c 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -133,15 +133,6 @@ freecad-utils.makeCustomizable ( "-DFREECAD_USE_PYBIND11=ON" "-DBUILD_QT5=OFF" "-DBUILD_QT6=ON" - "-DSHIBOKEN_INCLUDE_DIR=${python3Packages.shiboken6}/include" - "-DSHIBOKEN_LIBRARY=Shiboken6::libshiboken" - ( - "-DPYSIDE_INCLUDE_DIR=${python3Packages.pyside6}/include" - + ";${python3Packages.pyside6}/include/PySide6/QtCore" - + ";${python3Packages.pyside6}/include/PySide6/QtWidgets" - + ";${python3Packages.pyside6}/include/PySide6/QtGui" - ) - "-DPYSIDE_LIBRARY=PySide6::pyside6" ]; # This should work on both x86_64, and i686 linux From a30c74876a101a6e71ba4b80eddf042c8bedb466 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 12 Oct 2025 01:26:26 +0800 Subject: [PATCH 3/4] freecad: inherit python from python3Pacakges in makeCustomizable --- pkgs/by-name/fr/freecad/freecad-utils.nix | 4 ++-- pkgs/by-name/fr/freecad/package.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/freecad/freecad-utils.nix b/pkgs/by-name/fr/freecad/freecad-utils.nix index 8d440540d7bf..61705c11ec8e 100644 --- a/pkgs/by-name/fr/freecad/freecad-utils.nix +++ b/pkgs/by-name/fr/freecad/freecad-utils.nix @@ -3,7 +3,7 @@ buildEnv, makeWrapper, lib, - python311, + python, writeShellScript, }: let @@ -36,7 +36,7 @@ let if builtins.isString pyt then pyt else if builtins.isFunction pyt then - "${(python311.withPackages pyt)}/lib/python3.11/site-packages" + "${(python.withPackages pyt)}/${python.sitePackages}" else throw "Expected string or function as python paths for freecad" ); diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index da621c72a08c..233a3d6d8b87 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -52,7 +52,7 @@ let shiboken6 ]; - freecad-utils = callPackage ./freecad-utils.nix { }; + freecad-utils = callPackage ./freecad-utils.nix { inherit (python3Packages) python; }; in freecad-utils.makeCustomizable ( stdenv.mkDerivation (finalAttrs: { From 69b1583520e8c1878819a0ab0b7f431793552509 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 12 Oct 2025 01:20:01 +0800 Subject: [PATCH 4/4] freecad: cleanup dependencies --- pkgs/by-name/fr/freecad/README.md | 7 ------- pkgs/by-name/fr/freecad/package.nix | 22 +++++----------------- 2 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 pkgs/by-name/fr/freecad/README.md diff --git a/pkgs/by-name/fr/freecad/README.md b/pkgs/by-name/fr/freecad/README.md deleted file mode 100644 index f3fdae03e150..000000000000 --- a/pkgs/by-name/fr/freecad/README.md +++ /dev/null @@ -1,7 +0,0 @@ -This package supports the following parameters: - -- withWayland (default: true): when false, set QT_QPA_PLATFORM to xcb -- spaceNavSupport (enabled by default on Linux): whether to enable - [spacenavd support](https://spacenav.sourceforge.net/) -- ifcSupport (default: false): whether to enable ifc support through - ifcopenshell diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 233a3d6d8b87..c98d0a4cd32d 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -8,7 +8,6 @@ fetchFromGitHub, fetchpatch, fmt, - gfortran, gts, hdf5, libGLU, @@ -19,13 +18,11 @@ ninja, ode, opencascade-occt, + microsoft-gsl, pkg-config, python3Packages, - spaceNavSupport ? stdenv.hostPlatform.isLinux, stdenv, swig, - vtk, - wrapGAppsHook3, xercesc, yaml-cpp, zlib, @@ -50,6 +47,7 @@ let pyyaml # (at least for) PyrateWorkbench scipy shiboken6 + vtk ]; freecad-utils = callPackage ./freecad-utils.nix { inherit (python3Packages) python; }; @@ -71,10 +69,8 @@ freecad-utils.makeCustomizable ( cmake ninja pkg-config - gfortran swig doxygen - wrapGAppsHook3 qt6.wrapQtAppsHook ]; @@ -86,21 +82,21 @@ freecad-utils.makeCustomizable ( hdf5 libGLU libXmu + libspnav medfile ode - vtk xercesc yaml-cpp zlib opencascade-occt + microsoft-gsl qt6.qtbase qt6.qtsvg qt6.qttools qt6.qtwayland qt6.qtwebengine ] - ++ pythonDeps - ++ lib.optionals spaceNavSupport [ libspnav ]; + ++ pythonDeps; patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch @@ -135,13 +131,6 @@ freecad-utils.makeCustomizable ( "-DBUILD_QT6=ON" ]; - # This should work on both x86_64, and i686 linux - preBuild = '' - export NIX_LDFLAGS="-L${gfortran.cc.lib}/lib64 -L${gfortran.cc.lib}/lib $NIX_LDFLAGS"; - ''; - - dontWrapGApps = true; - qtWrapperArgs = let binPath = lib.makeBinPath [ @@ -153,7 +142,6 @@ freecad-utils.makeCustomizable ( "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" "--prefix PATH : ${binPath}" "--prefix PYTHONPATH : ${python3Packages.makePythonPath pythonDeps}" - "\${gappsWrapperArgs[@]}" ]; postFixup = ''