diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-10-07 21:41:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 21:41:39 +0200 |
| commit | 5d69399184ef7b1fea518586389cf8f09bd8daf7 (patch) | |
| tree | 46ce9fd446f6df6fa509ead160ae234b1accbcf6 /pkgs/development/libraries | |
| parent | 2eeab5e3b2e3f3ccd3c8fe55c367c71d2959a900 (diff) | |
| parent | 1a10a377ec3ca74cb3029a3f8fd14b28591e23b9 (diff) | |
| download | nixlib-5d69399184ef7b1fea518586389cf8f09bd8daf7.tar nixlib-5d69399184ef7b1fea518586389cf8f09bd8daf7.tar.gz nixlib-5d69399184ef7b1fea518586389cf8f09bd8daf7.tar.bz2 nixlib-5d69399184ef7b1fea518586389cf8f09bd8daf7.tar.lz nixlib-5d69399184ef7b1fea518586389cf8f09bd8daf7.tar.xz nixlib-5d69399184ef7b1fea518586389cf8f09bd8daf7.tar.zst nixlib-5d69399184ef7b1fea518586389cf8f09bd8daf7.zip | |
Merge pull request #19285 from acowley/pcl-darwin-opengl
pcl: fix problem finding OpenGL on darwin
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/pcl/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 42a8d00eec01..b9762e284e68 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 -, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private +, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL }: stdenv.mkDerivation rec { @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { libpng vtk qt4 libXt ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" ]; + "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" + ]; preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed "s,[[:space:]]*-F$NIX_STORE/[[:alnum:]]*-CF-osx-[[:digit:].]*/Library/Frameworks,,g") |