From 32adfbfb3dfe861d5ad7c8e830fea423bdfb47d5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 16 Sep 2016 19:18:26 +0300
Subject: [PATCH] openscenegraph: 3.2.1 -> 3.2.3

---
 .../libraries/openscenegraph/default.nix      | 39 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  5 +--
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 975bcc3d3089..dcc2f41db7a1 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -1,39 +1,40 @@
-{ stdenv, lib, fetchurl, cmake, giflib, libjpeg, libtiff, lib3ds, freetype
-, libpng, coin3d, jasper, gdal_1_11, xproto, libX11, libXmu
-, freeglut, mesa, doxygen, ffmpeg, xineLib, unzip, zlib, openal
-, libxml2, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
-, qt4, poppler, librsvg, gtk2
-, withApps ? true }:
+{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip
+, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11
+, cairo, poppler, librsvg, libpng, libtiff, libXrandr
+, xineLib, boost
+, withApps ? false
+, withSDL ? false, SDL
+, withQt4 ? false, qt4
+}:
 
 stdenv.mkDerivation rec {
   name = "openscenegraph-${version}";
-  version = "3.2.1";
+  version = "3.2.3";
 
   src = fetchurl {
-    url = "http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
-    sha256 = "0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
+    url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip";
+    sha256 = "0gic1hy7fhs27ipbsa5862q120a9y4bx176nfaw2brcjp522zvb9";
   };
 
+  nativeBuildInputs = [ pkgconfig cmake doxygen unzip ];
+
   buildInputs = [
-    cmake giflib libjpeg libtiff lib3ds freetype libpng coin3d jasper
-    gdal_1_11 xproto libX11 libXmu freeglut mesa doxygen ffmpeg
-    xineLib unzip zlib openal libxml2 curl a52dec faad2 gdk_pixbuf
-    pkgconfig kbproto SDL qt4 poppler librsvg gtk2
-  ];
+    freetype libjpeg jasper libxml2 zlib gdal curl libX11
+    cairo poppler librsvg libpng libtiff libXrandr boost
+    xineLib
+  ] ++ lib.optional withSDL SDL
+    ++ lib.optional withQt4 qt4;
 
   enableParallelBuilding = true;
 
-  cmakeFlags = [
-    "-DMATH_LIBRARY="
-    "-DCMAKE_C_FLAGS=-D__STDC_CONSTANT_MACROS=1"
-    "-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS=1"
-  ] ++ lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF";
+  cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF";
 
   meta = with stdenv.lib; {
     description = "A 3D graphics toolkit";
     homepage = http://www.openscenegraph.org/;
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
+    hydraPlatforms = lib.optionals (!withQt5) meta.platforms;
     license = "OpenSceneGraph Public License - free LGPL-based license";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec2400b10a67..1d0133d60c41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9044,10 +9044,7 @@ in
   openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };
   openjpeg = openjpeg_2_1;
 
-  openscenegraph = callPackage ../development/libraries/openscenegraph {
-    giflib = giflib_4_1;
-    ffmpeg = ffmpeg_0;
-  };
+  openscenegraph = callPackage ../development/libraries/openscenegraph { };
 
   openslp = callPackage ../development/libraries/openslp {};