diff options
| author | Rob <86313040+robert-manchester@users.noreply.github.com> | 2023-11-07 20:10:42 -0800 |
|---|---|---|
| committer | Yt <happysalada@tuta.io> | 2023-11-11 07:53:38 +0000 |
| commit | d183e6970909d4690271597fc96472cae54d9a0f (patch) | |
| tree | edab39dff2b26c1263fdc0900c085fca48548562 | |
| parent | 58ee71d96cf9a9285ab4c5528ae5e7cc62377ae8 (diff) | |
| download | nixlib-d183e6970909d4690271597fc96472cae54d9a0f.tar nixlib-d183e6970909d4690271597fc96472cae54d9a0f.tar.gz nixlib-d183e6970909d4690271597fc96472cae54d9a0f.tar.bz2 nixlib-d183e6970909d4690271597fc96472cae54d9a0f.tar.lz nixlib-d183e6970909d4690271597fc96472cae54d9a0f.tar.xz nixlib-d183e6970909d4690271597fc96472cae54d9a0f.tar.zst nixlib-d183e6970909d4690271597fc96472cae54d9a0f.zip | |
openbrf: fix build
patch BoundaryWeight into BoundaryQuadricWeight and QualityQuadricWeight add eigen to include path as it is no longer in the vcg include directory
| -rw-r--r-- | pkgs/applications/misc/openbrf/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index c0fb436b7f8a..63734811ff43 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, fetchpatch, qtbase, vcg, glew, qmake, libGLU, eigen, libGL }: mkDerivation { @@ -12,12 +12,23 @@ mkDerivation { sha256 = "16254cnr60ihcn7bki7wl1qm6gkvzb99cn66md1pnb7za8nvzf4j"; }; - buildInputs = [ qtbase vcg glew ]; + patches = [ + # https://github.com/cfcohen/openbrf/pull/7 + (fetchpatch { + name = "fix-build-against-newer-vcglib.patch"; + url = "https://github.com/cfcohen/openbrf/commit/6d82a25314a393e72bfbe2ffc3965bcac407df4c.patch"; + hash = "sha256-rNxAw6Le6QXMSirIAMhMmqVgNJLq6osnEOhWrY3mTpM="; + }) + ]; + + buildInputs = [ qtbase vcg glew eigen ]; nativeBuildInputs = [ qmake ]; qmakeFlags = [ "openBrf.pro" ]; + env.NIX_CFLAGS_COMPILE = "-isystem ${lib.getDev eigen}/include/eigen3"; + postPatch = '' sed -i 's,^VCGLIB .*,VCGLIB = ${vcg}/include,' openBrf.pro ''; |