Commit 25d3e5cb authored by Gaetan Lepage's avatar Gaetan Lepage
Browse files

pcl: move to by-name

parent a0fe078b

pkgs/development/libraries/pcl/default.nix→pkgs/by-name/pc/pcl/package.nix

+10 −23
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  wrapQtAppsHook,

  cmake,

  qhull,

  flann,
@@ -10,15 +9,12 @@ 
  vtk,

  eigen,

  pkg-config,

  qtbase,

  libsForQt5,

  libusb1,

  libpcap,

  libtiff,

  libXt,

  libpng,

  Cocoa,

  AGL,

  OpenGL,

  config,

  cudaSupport ? config.cudaSupport,

  cudaPackages,
@@ -44,20 +40,15 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [

    pkg-config

    cmake

    wrapQtAppsHook

    libsForQt5.wrapQtAppsHook

  ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];



  buildInputs =

    [

  buildInputs = [

    eigen

    libusb1

    libpcap

      qtbase

    libsForQt5.qtbase

    libXt

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      Cocoa

      AGL

  ];



  propagatedBuildInputs = [
@@ -69,11 +60,7 @@ stdenv.mkDerivation rec { 
    vtk

  ];



  cmakeFlags =

    lib.optionals stdenv.hostPlatform.isDarwin [

      "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"

    ]

    ++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ];

  cmakeFlags = lib.optionals cudaSupport [ "-DWITH_CUDA=true" ];



  meta = {

    homepage = "https://pointclouds.org/";

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -10214,10 +10214,6 @@ with pkgs; 
    buildPythonPackage buildPythonApplication setuptools pycsdr pydigiham;

  };













  pcl = libsForQt5.callPackage ../development/libraries/pcl {













    inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL;













  };



























  pcre = callPackage ../development/libraries/pcre { };















  pcre16 = res.pcre.override { variant = "pcre16"; };















  # pcre32 seems unused