colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19285 from acowley/pcl-darwin-opengl

Browse Source 
pcl: fix problem finding OpenGL on darwin
This commit is contained in:
Daiderd Jordan 2016-10-07 21:41:39 +02:00 committed by GitHub
commit 5d69399184
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/pcl/default.nix
View File

@ -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")

2
pkgs/top-level/all-packages.nix
View File

@ -8636,7 +8636,7 @@ in
pcl = callPackage ../development/libraries/pcl {
vtk = vtkWithQt4;
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa AGL;
inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL;
};
pcre = callPackage ../development/libraries/pcre { };