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

pcl: remove cf-private

Browse Source
This commit is contained in:
Daiderd Jordan 2019-06-19 20:23:50 +02:00
parent 2f9a546b96
commit 0fb071fd00
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake { stdenv, fetchFromGitHub, cmake
, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase , 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 { stdenv.mkDerivation rec {
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qhull flann boost eigen libusb1 libpcap buildInputs = [ qhull flann boost eigen libusb1 libpcap
libpng vtk qtbase libXt ] 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 [ cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
]; ];

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

@ -12611,7 +12611,6 @@ in
pcg_c = callPackage ../development/libraries/pcg-c { }; pcg_c = callPackage ../development/libraries/pcg-c { };
pcl = libsForQt5.callPackage ../development/libraries/pcl { pcl = libsForQt5.callPackage ../development/libraries/pcl {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL;
}; };