From ac8f2391f322e5c058dd08b8911d18c1e19fbcd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 19 Aug 2015 23:31:46 +0200
Subject: [PATCH] pcl: 1.6.0 -> 1.7.2 (unbreaks build)

New deps added: libXt (required), libpcap (optional).

Releases are now at github.
---
 pkgs/development/libraries/pcl/default.nix | 20 +++++++++++---------
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index a71709b554b4..46e2da18aa1e 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchurl, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4, libusb1 }:
+{ stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
+, libusb1, libpcap, libXt
+}:
 
-stdenv.mkDerivation {
-  name = "pcl-1.6.0";
+stdenv.mkDerivation rec {
+  name = "pcl-1.7.2";
 
-  buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 ];
-
-  src = fetchurl {
-    url = mirror://sourceforge/pointclouds/PCL-1.6.0-Source.tar.bz2;
-    sha256 = "0ip3djcjgynlr9vac6jlcw6kxhg2lm8fc0aqk747a6l0rqvllf1x";
+  src = fetchzip {
+    name = name + "-src";
+    url = "https://github.com/PointCloudLibrary/pcl/archive/${name}.tar.gz";
+    sha256 = "0sm19p6wcls2d9l0vi5fgwqp7l372nh3g7bdin42w31zr8dmz8h8";
   };
 
   enableParallelBuilding = true;
 
+  buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 libpcap libXt ];
+
   meta = {
     homepage = http://pointclouds.org/;
     description = "Open project for 2D/3D image and point cloud processing";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
-    broken = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a963c701d2f..6f09fd5d51ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7810,6 +7810,7 @@ let
 
   pcl = callPackage ../development/libraries/pcl {
     vtk = vtkWithQt4;
+    inherit (xorg) libXt;
   };
 
   pcre = callPackage ../development/libraries/pcre {