diff --git a/pkgs/applications/misc/blender/2.49.nix b/pkgs/applications/misc/blender/2.49.nix deleted file mode 100644 index 6a66c45b94f..00000000000 --- a/pkgs/applications/misc/blender/2.49.nix +++ /dev/null @@ -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+"; - }; -} diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 75d737e5996..c291192ef01 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg, libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg, -python, zlib }: +python, zlib, boost }: stdenv.mkDerivation rec { - name = "blender-2.57"; + name = "blender-2.62"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "1f4l0zkfmbd8ydzwvmb5jw89y7ywd9k8m2f1b3hrdpgjcqhq3lcb"; + sha256 = "19xfr5vx66p4p3hnqpglpky6f4bh3ay484mdgh7zg6j9f80dp53q"; }; 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 = '' - sed -e "s@/usr/local@${python}@" -i build_files/cmake/FindPythonLibsUnix.cmake - ''; - - cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR" - "-DWITH_OPENCOLLADA=OFF" "-DWITH_INSTALL_PORTABLE=OFF"]; + cmakeFlags = [ + "-DOPENEXR_INC=${openexr}/include/OpenEXR" + "-DWITH_OPENCOLLADA=OFF" + "-DWITH_INSTALL_PORTABLE=OFF" + "-DPYTHON_LIBPATH=${python}/lib" + ]; NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d429751bffb..e87454999b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6449,14 +6449,9 @@ let gnutls = gnutls2; }; - blender = callPackage ../applications/misc/blender/2.49.nix { }; - - 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; + blender = callPackage ../applications/misc/blender { python = python32; - }); + }; bvi = callPackage ../applications/editors/bvi { };