diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:20:49 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:23:16 +0000 |
| commit | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (patch) | |
| tree | bbb659ab07fda4c9b98053499b7e3f046ac6d5dc /nixpkgs/pkgs/development/libraries/pcl | |
| parent | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (diff) | |
| parent | 8746c77a383f5c76153c7a181f3616d273acfa2a (diff) | |
| download | nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.gz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.bz2 nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.lz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.xz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.zst nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.zip | |
Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pcl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/pcl/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pcl/default.nix b/nixpkgs/pkgs/development/libraries/pcl/default.nix index fd2b9feff68b..331581294690 100644 --- a/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake , qhull, flann, boost, vtk, eigen, pkgconfig, qtbase -, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL +, libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL }: stdenv.mkDerivation rec { @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qhull flann boost eigen libusb1 libpcap libpng vtk qtbase libXt ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL ]; - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; |