openscenegraph: 3.2.1 -> 3.2.3

+21 -23
+20 -19
pkgs/development/libraries/openscenegraph/default.nix
··· 1 - { stdenv, lib, fetchurl, cmake, giflib, libjpeg, libtiff, lib3ds, freetype 2 - , libpng, coin3d, jasper, gdal_1_11, xproto, libX11, libXmu 3 - , freeglut, mesa, doxygen, ffmpeg, xineLib, unzip, zlib, openal 4 - , libxml2, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL 5 - , qt4, poppler, librsvg, gtk2 6 - , withApps ? true }: 1 + { stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip 2 + , freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11 3 + , cairo, poppler, librsvg, libpng, libtiff, libXrandr 4 + , xineLib, boost 5 + , withApps ? false 6 + , withSDL ? false, SDL 7 + , withQt4 ? false, qt4 8 + }: 7 9 8 10 stdenv.mkDerivation rec { 9 11 name = "openscenegraph-${version}"; 10 - version = "3.2.1"; 12 + version = "3.2.3"; 11 13 12 14 src = fetchurl { 13 - url = "http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip"; 14 - sha256 = "0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr"; 15 + url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip"; 16 + sha256 = "0gic1hy7fhs27ipbsa5862q120a9y4bx176nfaw2brcjp522zvb9"; 15 17 }; 16 18 19 + nativeBuildInputs = [ pkgconfig cmake doxygen unzip ]; 20 + 17 21 buildInputs = [ 18 - cmake giflib libjpeg libtiff lib3ds freetype libpng coin3d jasper 19 - gdal_1_11 xproto libX11 libXmu freeglut mesa doxygen ffmpeg 20 - xineLib unzip zlib openal libxml2 curl a52dec faad2 gdk_pixbuf 21 - pkgconfig kbproto SDL qt4 poppler librsvg gtk2 22 - ]; 22 + freetype libjpeg jasper libxml2 zlib gdal curl libX11 23 + cairo poppler librsvg libpng libtiff libXrandr boost 24 + xineLib 25 + ] ++ lib.optional withSDL SDL 26 + ++ lib.optional withQt4 qt4; 23 27 24 28 enableParallelBuilding = true; 25 29 26 - cmakeFlags = [ 27 - "-DMATH_LIBRARY=" 28 - "-DCMAKE_C_FLAGS=-D__STDC_CONSTANT_MACROS=1" 29 - "-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS=1" 30 - ] ++ lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; 30 + cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; 31 31 32 32 meta = with stdenv.lib; { 33 33 description = "A 3D graphics toolkit"; 34 34 homepage = http://www.openscenegraph.org/; 35 35 maintainers = [ maintainers.raskin ]; 36 36 platforms = platforms.linux; 37 + hydraPlatforms = lib.optionals (!withQt5) meta.platforms; 37 38 license = "OpenSceneGraph Public License - free LGPL-based license"; 38 39 }; 39 40 }
+1 -4
pkgs/top-level/all-packages.nix
··· 9044 9044 openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; 9045 9045 openjpeg = openjpeg_2_1; 9046 9046 9047 - openscenegraph = callPackage ../development/libraries/openscenegraph { 9048 - giflib = giflib_4_1; 9049 - ffmpeg = ffmpeg_0; 9050 - }; 9047 + openscenegraph = callPackage ../development/libraries/openscenegraph { }; 9051 9048 9052 9049 openslp = callPackage ../development/libraries/openslp {}; 9053 9050