From f344310e9a1f61842df89007e54e4f95582335a3 Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 7 Mar 2025 20:49:56 +0800 Subject: [PATCH 1/2] python312Packages.netgen: rename to python312Packages.netgen-mesher --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 308034bcc43c..65fee7a84c83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9395,7 +9395,7 @@ self: super: with self; { netdisco = callPackage ../development/python-modules/netdisco { }; - netgen = toPythonModule (pkgs.netgen.override { python3Packages = self; }); + netgen-mesher = toPythonModule (pkgs.netgen.override { python3Packages = self; }); nethsm = callPackage ../development/python-modules/nethsm { }; From a87386935316bc678f65aaec48c847eb4a4de3c0 Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 7 Mar 2025 20:50:21 +0800 Subject: [PATCH 2/2] netgen: hardcoding libnggui path in tcl script --- pkgs/by-name/ne/netgen/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix index 46086c442524..d034a54c7fdb 100644 --- a/pkgs/by-name/ne/netgen/package.nix +++ b/pkgs/by-name/ne/netgen/package.nix @@ -78,6 +78,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace python/CMakeLists.txt \ --replace-fail ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}' \ ''\'''${CMAKE_INSTALL_PREFIX}/''${NG_INSTALL_DIR_PYTHON}:$ENV{PYTHONPATH}' + + substituteInPlace ng/ng.tcl ng/onetcl.cpp \ + --replace-fail "libnggui" "$out/lib/libnggui" ''; nativeBuildInputs = [ @@ -121,11 +124,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doInstallCheck) ]; - # Tcl script used by netgen need to be aware of environment NETGENDIR - postInstall = '' - wrapProgram "$out/bin/netgen" --set NETGENDIR "$out/bin" - ''; - # mesh generation differs on x86_64 and aarch64 platform # tests will fail on aarch64 platform doInstallCheck = stdenv.hostPlatform.isx86_64;