diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-01-07 07:51:57 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-01-07 07:51:57 +0100 |
| commit | 0dc45cc1ed9b7b449ab417e6ab955ed4e50836ec (patch) | |
| tree | 6425c9894e80c237cf2fef68817fe0b3abb5b382 /pkgs/applications/science/math | |
| parent | db78c6396cc0ee90bcf0cb71953f1f05ee9a27c9 (diff) | |
| parent | 775c761fd8cb59a2af52ad79a50ec2a4e1f2db78 (diff) | |
| download | nixlib-0dc45cc1ed9b7b449ab417e6ab955ed4e50836ec.tar nixlib-0dc45cc1ed9b7b449ab417e6ab955ed4e50836ec.tar.gz nixlib-0dc45cc1ed9b7b449ab417e6ab955ed4e50836ec.tar.bz2 nixlib-0dc45cc1ed9b7b449ab417e6ab955ed4e50836ec.tar.lz nixlib-0dc45cc1ed9b7b449ab417e6ab955ed4e50836ec.tar.xz nixlib-0dc45cc1ed9b7b449ab417e6ab955ed4e50836ec.tar.zst nixlib-0dc45cc1ed9b7b449ab417e6ab955ed4e50836ec.zip | |
Merge #278132: gmsh: pull gcc-13 build fix from upstream
...into staging-next
Diffstat (limited to 'pkgs/applications/science/math')
| -rw-r--r-- | pkgs/applications/science/math/gmsh/default.nix | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 4d9b3afe31ca..62a0c3c405df 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg +{ lib, stdenv, fetchurl, fetchpatch, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt , python ? null, enablePython ? false }: @@ -24,7 +24,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./fix-python.patch ]; + patches = [ + ./fix-python.patch + + # Pull upstream fix git gcc-13: + # https://gitlab.onelab.info/gmsh/gmsh/-/issues/2416 + (fetchpatch { + name = "gcc-13-p1.patch"; + url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/fb81a9c9026700e078de947b4522cb39e543a86b.patch"; + hash = "sha256-1GInFqQZvOgflC3eQTjmZ9uBGFASRNCpCwDACN3yTQ4="; + }) + (fetchpatch { + name = "gcc-13-p2.patch"; + url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/aceb09c807b78ea26555f99fcb16c4f87c31fb5a.patch"; + hash = "sha256-6FI0hIvj8hglCvxoKV0GzT2/F/Wz+ddkxV/TLzzJBLU="; + }) + ]; postPatch = '' substituteInPlace api/gmsh.py --subst-var-by LIBPATH ${placeholder "out"}/lib/libgmsh.so |