diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-23 20:09:11 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-23 20:09:11 +0100 |
| commit | 5e8747300eea9bca1b8bae945fe61e2918a7f560 (patch) | |
| tree | a2f18bb0442981ae768bb6c69fc675bbcd50a59c /pkgs/development/libraries/openscenegraph/default.nix | |
| parent | 0eeae100fd039067347f814dde29a351d13799e8 (diff) | |
| download | nixpkgs-5e8747300eea9bca1b8bae945fe61e2918a7f560.tar nixpkgs-5e8747300eea9bca1b8bae945fe61e2918a7f560.tar.gz nixpkgs-5e8747300eea9bca1b8bae945fe61e2918a7f560.tar.bz2 nixpkgs-5e8747300eea9bca1b8bae945fe61e2918a7f560.tar.lz nixpkgs-5e8747300eea9bca1b8bae945fe61e2918a7f560.tar.xz nixpkgs-5e8747300eea9bca1b8bae945fe61e2918a7f560.tar.zst nixpkgs-5e8747300eea9bca1b8bae945fe61e2918a7f560.zip | |
openscenegraph: update and fix
Diffstat (limited to 'pkgs/development/libraries/openscenegraph/default.nix')
| -rw-r--r-- | pkgs/development/libraries/openscenegraph/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 08e08b876b6..01993fa1cd8 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -2,22 +2,22 @@ x@{builderDefsPackage , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng , coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2 - , curl + , curl, a52dec, faad2, gdk_pixbuf , ...}: builderDefsPackage (a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="OpenSceneGraph"; - version="2.8.3"; + version="3.0.1"; name="${baseName}-${version}"; url="http://www.openscenegraph.org/downloads/stable_releases/${name}/source/${name}.zip"; - hash="0phihxs7zgir9n1z54xsrsha8wa0xll7xl6lvqvrrczf0bm80yrs"; + hash="15l23mxv93mw6wkc90x52jhwxh7r3d7lahwdsv3jfnha9dbh648c"; }; in rec { @@ -30,7 +30,9 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "addInputs" "doUnpack" "doCmake" "doMakeInstall"]; + phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"]; + + patches = [ ./xine.patch ]; # http://forum.openscenegraph.org/viewtopic.php?t=9659 cmakeFlags = [ "-D MATH_LIBRARY=" @@ -39,7 +41,7 @@ rec { setVars = a.noDepEntry '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1" ''; - + meta = { description = "A 3D graphics toolkit"; maintainers = with a.lib.maintainers; |