[Nix-dev] [PATCH] t/blender

[Marc Weber]

updating blender unstable because new beta version has Python completion
support in console (ctrl-space)

Signed-off-by: Marc Weber <marco-oweber at gmx.de>
---
 pkgs/applications/misc/blender/default.nix        |   10 +++++++---
 pkgs/applications/misc/blender/python-chmod.patch |   18 +++++++++---------
 pkgs/top-level/all-packages.nix                   |    2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 87d91e5..01a343c 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -2,11 +2,15 @@
 , openexr, libsamplerate, libXi, libtiff, ilmbase }:
 
 stdenv.mkDerivation rec {
-  name = "blender-2.50a1";
+  name = "blender-2.53-beta";
+
+
 
   src = fetchurl {
-    url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "1cik05fmf9b8z3qpwsm6q9h1ia87w1piz87hxhfs24jw6l5pyiwr";
+    # url = "http://download.blender.org/source/${name}.tar.gz";
+    # sha256 = "1cik05fmf9b8z3qpwsm6q9h1ia87w1piz87hxhfs24jw6l5pyiwr";
+    url = "http://download.blender.org/source/blender-2.53-beta.tar.gz";
+    md5 = "24151a832983a3e2ce652ec03cc03acb";
   };
 
   buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal SDL openexr libsamplerate
diff --git a/pkgs/applications/misc/blender/python-chmod.patch b/pkgs/applications/misc/blender/python-chmod.patch
index bda04b1..4cc1d23 100644
--- a/pkgs/applications/misc/blender/python-chmod.patch
+++ b/pkgs/applications/misc/blender/python-chmod.patch
@@ -1,14 +1,14 @@
 As the code copied from the nix store, the files there do not have the 'writeable' permission.
 Hence this fix, needed on nix but not on usual LSB linuces.
 diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 386ef1b..6a180fa 100644
+index 9296e79..eb98c29 100755
 --- a/source/creator/CMakeLists.txt
 +++ b/source/creator/CMakeLists.txt
-@@ -152,6 +152,7 @@ IF(WITH_INSTALL)
- 				COMMAND mkdir ${TARGETDIR}/.blender/python # PYTHONPATH and PYTHONHOME is set here
- 				COMMAND mkdir ${TARGETDIR}/.blender/python/lib/
- 				COMMAND cp -R ${PYTHON_LIBPATH}/python${PYTHON_VERSION} ${TARGETDIR}/.blender/python/lib/
-+        COMMAND chmod -R +w ${TARGETDIR}/.blender/python/lib/
-         
- 				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/distutils
- 				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib2to3
+@@ -153,6 +153,7 @@ IF(WITH_INSTALL)
+ 				COMMAND mkdir ${TARGETDIR}/.blender/python # PYTHONPATH and PYTHONHOME is set here

+ 				COMMAND mkdir ${TARGETDIR}/.blender/python/lib/

+ 				COMMAND cp -R ${PYTHON_LIBPATH}/python${PYTHON_VERSION} ${TARGETDIR}/.blender/python/lib/

++				COMMAND chmod -R +w ${TARGETDIR}/.blender/python/lib/

+         

+ 				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/distutils

+ 				COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib2to3

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2471c33..e07e966 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5141,7 +5141,7 @@ let
     stdenv = stdenv2;
   };
 
-  blender_2_50 = lowPrio (import ../applications/misc/blender {
+  blender_2_53 = lowPrio (import ../applications/misc/blender {
     inherit fetchurl cmake mesa gettext libjpeg libpng zlib openal SDL openexr
       libsamplerate libtiff ilmbase;
     inherit (xlibs) libXi;
-- 
1.7.2.1