From 7ce3f6f976d4362009f41c69ba634c08a2775db1 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 30 Dec 2015 00:06:34 +0100 Subject: [PATCH] openscenegraph: use stdenv This replaces use of `builderDefsPackage`. Also minor cleanups. --- .../libraries/openscenegraph/default.nix | 78 +++++++------------ 1 file changed, 27 insertions(+), 51 deletions(-) diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index ecb4d82c9658..578d0219c020 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,60 +1,36 @@ -x@{builderDefsPackage - , 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, gtk - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, 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, gtk }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="OpenSceneGraph"; - version="3.2.1"; - name="${baseName}-${version}"; - url="http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip"; - hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "openscenegraph-${version}"; + version = "3.2.1"; + + src = fetchurl { + url = "http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip"; + sha256 = "0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"]; - - cmakeFlags = [ - "-D MATH_LIBRARY=" + 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 gtk ]; - setVars = a.noDepEntry '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1" - ''; + cmakeFlags = [ + "-DMATH_LIBRARY=" + "-DCMAKE_C_FLAGS=-D__STDC_CONSTANT_MACROS=1" + "-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS=1" + ]; - meta = { + meta = with stdenv.lib; { description = "A 3D graphics toolkit"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + homepage = http://www.openscenegraph.org/; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; license = "OpenSceneGraph Public License - free LGPL-based license"; }; - passthru = { - updateInfo = { - downloadPage = "http://www.openscenegraph.org/projects/osg/wiki/Downloads"; - }; - }; -}) x - +}