Author: cillian
Date: Tue Apr 19 20:17:17 2011
New Revision: 26894
URL: https://svn.nixos.org/websvn/nix/?rev=26894&sc=1
Log:
Updating Blender to the stable release 2.57 and adding python32 as a build input
Deleted:
nixpkgs/trunk/pkgs/applications/misc/blender/python-chmod.patch
Modified:
nixpkgs/trunk/pkgs/applications/misc/blender/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/blender/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/blender/default.nix Tue Apr 19
18:10:15 2011 (r26893)
+++ nixpkgs/trunk/pkgs/applications/misc/blender/default.nix Tue Apr 19
20:17:17 2011 (r26894)
@@ -1,23 +1,26 @@
-{stdenv, fetchurl, cmake, mesa, gettext, python, libjpeg, libpng, zlib,
openal, SDL
-, openexr, libsamplerate, libXi, libtiff, ilmbase }:
+{ stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg,
+libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
+python, zlib }:
stdenv.mkDerivation rec {
- name = "blender-2.50a1";
+ name = "blender-2.57";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";;
- sha256 = "1cik05fmf9b8z3qpwsm6q9h1ia87w1piz87hxhfs24jw6l5pyiwr";
+ sha256 = "1f4l0zkfmbd8ydzwvmb5jw89y7ywd9k8m2f1b3hrdpgjcqhq3lcb";
};
- buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal SDL
openexr libsamplerate
- libXi libtiff ilmbase ];
+ buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
+ SDL openexr libsamplerate libXi libtiff ilmbase openjpeg ];
- cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR"
"-DWITH_OPENCOLLADA=OFF"
- "-DPYTHON_LIBPATH=${python}/lib" ];
+ patchPhase = ''
+ sed -e "s@/usr/local@${python}@" -i
build_files/cmake/FindPythonLibsUnix.cmake
+ '';
- NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR
-I${python}/include/${python.libPrefix}";
+ cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR"
+ "-DWITH_OPENCOLLADA=OFF" "-DWITH_INSTALL_PORTABLE=OFF"];
- patches = [ ./python-chmod.patch ];
+ NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR
-I${python}/include/${python.libPrefix}";
meta = {
description = "3D Creation/Animation/Publishing System";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Apr 19 18:10:15
2011 (r26893)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Apr 19 20:17:17
2011 (r26894)
@@ -2398,6 +2398,11 @@
sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
};
+ python32 = callPackage ../development/interpreters/python/3.2 {
+ arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null;
+ sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
+ };
+
pythonFull = callPackage ../development/interpreters/python/wrapper.nix {
extraLibs = lib.attrValues python.modules;
};
@@ -5808,11 +5813,11 @@
blender = callPackage ../applications/misc/blender/2.49.nix { };
- blender_2_50 = lowPrio (import ../applications/misc/blender {
- inherit stdenv fetchurl cmake mesa gettext libjpeg libpng zlib openal SDL
openexr
- libsamplerate libtiff ilmbase;
+ 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 = python3;
+ python = python32;
});
bvi = callPackage ../applications/editors/bvi { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
