alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

blender: minor update to work with libpng-1.6

Browse source 
also other fixes needed in order to build
This commit is contained in:
Vladimír Čunát 2013-02-16 18:13:05 +01:00
parent b3ce50d88a
commit 08abf5a84a
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/applications/misc/blender/default.nix
View file

@ -1,26 +1,32 @@
{ stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg,
libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
python, zlib, boost }:
python, zlib, boost, glew, xlibs }:
stdenv.mkDerivation rec {
name = "blender-2.63a";
name = "blender-2.65a";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
sha256 = "c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a";
sha256 = "1p7nszbqsn48s6jrj0bqav7q52gj82rpv1w5lhh64v092m3v9jpq";
};
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
SDL openexr libsamplerate libXi libtiff ilmbase openjpeg boost ];
SDL openexr libsamplerate libXi libtiff ilmbase openjpeg boost glew xlibs.libXxf86vm ];
patches = [ ./fix-include.patch ];
cmakeFlags = [
"-DOPENEXR_INC=${openexr}/include/OpenEXR"
"-DWITH_OPENCOLLADA=OFF"
"-DWITH_INSTALL_PORTABLE=OFF"
"-DPYTHON_LIBPATH=${python}/lib"
];
"-DPYTHON_LIBRARY=${python}/lib"
"-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}"
"-DOPENJPEG_INCLUDE_DIR=${openjpeg}/include"
"-DWITH_CYCLES=0" # would need openimageio
]; # ToDo?: more options available
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
NIX_CFLAGS_COMPILE = "-I${openjpeg}/include/${openjpeg.incDir} -I${ilmbase}/include/OpenEXR";
NIX_CFLAGS_LINK = "-lpython3";
enableParallelBuilding = true;

3
pkgs/development/libraries/openjpeg/default.nix
View file

@ -2,6 +2,9 @@
stdenv.mkDerivation rec {
name = "openjpeg-1.5.1";
passthru = {
incDir = "openjpeg-1.5";
};
src = fetchurl {
url = "http://openjpeg.googlecode.com/files/${name}.tar.gz";

2
pkgs/top-level/all-packages.nix
View file

@ -6711,7 +6711,7 @@ let
};
blender = callPackage ../applications/misc/blender {
python = python32;
python = python33; # 2.65a doesn't accept lower
};
bristol = callPackage ../applications/audio/bristol { };