netgen: 6.2.2505 -> 6.2.2605
Diff: https://github.com/NGSolve/netgen/compare/v6.2.2505...v6.2.2605 Changelog: https://github.com/NGSolve/netgen/releases/tag/v6.2.2605
This commit is contained in:
@@ -35,13 +35,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netgen";
|
||||
version = "6.2.2505";
|
||||
version = "6.2.2605";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngsolve";
|
||||
repo = "netgen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MPnibhDzNjqmpW5C76KdeYoZGfKLU0KJ20EnjrK1S+Y=";
|
||||
hash = "sha256-067PzJymS6ayVoenaXEdvK3fraLTKPJTC54Aok1UUtg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -61,11 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "${patchSource}/include_stdlib.patch";
|
||||
hash = "sha256-W+NgGBuy/UmzVbPTSqR8FRUlyN/9dl9l9e9rxKklmIc=";
|
||||
})
|
||||
# Fix build with pybind11 3.x.
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/NGSolve/netgen/commit/ceacae3844ed2f0c48c8b6a3a82904b16c594f41.patch?full_index=1";
|
||||
hash = "sha256-uSlkKxuOoUt4n601vadEZogSF47zdWNOIk1Nr9Ra3AU=";
|
||||
})
|
||||
./ensure_python_before_getting_gil.patch
|
||||
./macos_use_tk_default_color_map.patch
|
||||
];
|
||||
@@ -147,6 +142,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doInstallCheck)
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (
|
||||
stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux
|
||||
) "-flax-vector-conversions";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
desktopItems = [
|
||||
|
||||
Reference in New Issue
Block a user