diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2020-12-11 16:19:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-11 16:19:06 +0100 |
| commit | 50accd8aff1147e090489537741cc36687c1c715 (patch) | |
| tree | 163d3c82a5a66b8047fb9172413a00b148c33c85 /pkgs | |
| parent | 3b85d7d54f083f46cf06eddcd7694a9078ad13d3 (diff) | |
| parent | ce9c9f0fe0ad4094a47be2341b0c5073f777eb4f (diff) | |
Merge pull request #106641 from raboof/smesh-fix-building-with-clang
smesh: fix building with clang
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/smesh/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/smesh/default.nix b/pkgs/development/libraries/smesh/default.nix index 529f910c35ae..9a52c42c9397 100644 --- a/pkgs/development/libraries/smesh/default.nix +++ b/pkgs/development/libraries/smesh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, opencascade }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade }: stdenv.mkDerivation rec { pname = "smesh"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1b07j3bw3lnxk8dk3x1kkl2mbsmfwi98si84054038lflaaijzi0"; }; + patches = [ + (fetchpatch { + name = "fix-build-with-clang.patch"; + url = "https://github.com/tpaviot/smesh/commit/e32c430f526f1637ec5973c9723acbc5be571ae3.patch"; + sha256 = "0s4j5rb70g3jvvkgfbrxv7q52wk6yjyjiaya61gy2j64khplcjlb"; + }) + ]; + nativeBuildInputs = [ cmake ninja ]; buildInputs = [ opencascade ]; |