public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating blender to 2.67. Maybe this will build in stdenv-updates too.

Browse Source 
I remove the blender 2.49; I think I don't need it anymore.


svn path=/nixpkgs/trunk/; revision=32599
This commit is contained in:
Lluís Batlle i Rossell 2012-02-26 20:47:12 +00:00
parent cb5bbe00fe
commit a9b800c8af
3 changed files with 12 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/applications/misc/blender/2.49.nix
View File

@ -1,33 +0,0 @@
{stdenv, fetchurl, cmake, mesa, gettext, python, libjpeg, libpng, zlib, openal, SDL
, openexr, libsamplerate, libXi, libtiff, ilmbase, freetype}:
stdenv.mkDerivation rec {
name = "blender-2.49b";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
sha256 = "1214fp2asij7l1sci2swh46nfjgpm72gk2qafq70xc0hmas4sm93";
};
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal SDL openexr libsamplerate
libXi libtiff ilmbase freetype ];
cmakeFlags = [ "-DFREETYPE_INC=${freetype}/include" "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF"
"-DPYTHON_LIBPATH=${python}/lib" ];
NIX_LDFLAGS = "-lX11";
NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix} -I${freetype}/include/freetype2";
installPhase = ''
ensureDir $out/bin
cp bin/* $out/bin
'';
meta = {
description = "3D Creation/Animation/Publishing System";
homepage = http://www.blender.org;
# They comment two licenses: GPLv2 and Blender License, but they
# say: "The BL has not been activated yet."
license = "GPLv2+";
};
}

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

@ -1,24 +1,24 @@
{ stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg, { stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg,
libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg, libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
python, zlib }: python, zlib, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "blender-2.57"; name = "blender-2.62";
src = fetchurl { src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz"; url = "http://download.blender.org/source/${name}.tar.gz";
sha256 = "1f4l0zkfmbd8ydzwvmb5jw89y7ywd9k8m2f1b3hrdpgjcqhq3lcb"; sha256 = "19xfr5vx66p4p3hnqpglpky6f4bh3ay484mdgh7zg6j9f80dp53q";
}; };
buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
SDL openexr libsamplerate libXi libtiff ilmbase openjpeg ]; SDL openexr libsamplerate libXi libtiff ilmbase openjpeg boost ];
patchPhase = '' cmakeFlags = [
sed -e "s@/usr/local@${python}@" -i build_files/cmake/FindPythonLibsUnix.cmake "-DOPENEXR_INC=${openexr}/include/OpenEXR"
''; "-DWITH_OPENCOLLADA=OFF"
"-DWITH_INSTALL_PORTABLE=OFF"
cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DPYTHON_LIBPATH=${python}/lib"
"-DWITH_OPENCOLLADA=OFF" "-DWITH_INSTALL_PORTABLE=OFF"]; ];
NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}"; NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";

9
pkgs/top-level/all-packages.nix
View File

@ -6449,14 +6449,9 @@ let
gnutls = gnutls2; gnutls = gnutls2;
}; };
blender = callPackage ../applications/misc/blender/2.49.nix { }; blender = callPackage ../applications/misc/blender {
blender_2_57 = lowPrio (import ../applications/misc/blender {
inherit stdenv fetchurl SDL cmake gettext ilmbase libjpeg libpng
libsamplerate libtiff mesa openal openexr openjpeg zlib;
inherit (xlibs) libXi;
python = python32; python = python32;
}); };
bvi = callPackage ../applications/editors/bvi { }; bvi = callPackage ../applications/editors/bvi { };