From e47a2a9651895a158c4917f73a0081e2eb9beb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@vicerveza.homeunix.net> Date: Mon, 10 May 2010 10:20:51 +0000 Subject: [PATCH] Adding blender 2.49, additional to the last 'alpha' 2.50 there already was in nixpkgs. I put the alpha in lowPrio too; too many things don't work still, there. svn path=/nixpkgs/trunk/; revision=21701 --- pkgs/applications/misc/blender/2.49.nix | 33 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 +++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/misc/blender/2.49.nix diff --git a/pkgs/applications/misc/blender/2.49.nix b/pkgs/applications/misc/blender/2.49.nix new file mode 100644 index 000000000000..6a66c45b94fc --- /dev/null +++ b/pkgs/applications/misc/blender/2.49.nix @@ -0,0 +1,33 @@ +{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+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2defc50c7041..9c07cf88f864 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7131,13 +7131,21 @@ let openal = openalSoft; }; - blender = import ../applications/misc/blender { + blender = import ../applications/misc/blender/2.49.nix { + inherit fetchurl cmake mesa gettext libjpeg libpng zlib openal SDL openexr + libsamplerate libtiff ilmbase freetype; + inherit (xlibs) libXi; + python = python26Base; + stdenv = stdenv2; + }; + + blender_2_50 = lowPrio (import ../applications/misc/blender { inherit fetchurl cmake mesa gettext libjpeg libpng zlib openal SDL openexr libsamplerate libtiff ilmbase; inherit (xlibs) libXi; python = python31Base; stdenv = stdenv2; - }; + }); bmp = import ../applications/audio/bmp { inherit fetchurl stdenv pkgconfig libogg libvorbis alsaLib id3lib;