openscenegraph: update and fix
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user