diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-15 22:52:23 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-15 23:31:55 +0200 |
| commit | 2d8e880c82e5363cf573a146d1d28f7ad23753f4 (patch) | |
| tree | 5a67ec6a6297668f400a15913bed79ac812ffcd5 /pkgs | |
| parent | 889b3f5f83bc788b35220fb568b117a4399b5a15 (diff) | |
| download | nixpkgs-2d8e880c82e5363cf573a146d1d28f7ad23753f4.tar nixpkgs-2d8e880c82e5363cf573a146d1d28f7ad23753f4.tar.gz nixpkgs-2d8e880c82e5363cf573a146d1d28f7ad23753f4.tar.bz2 nixpkgs-2d8e880c82e5363cf573a146d1d28f7ad23753f4.tar.lz nixpkgs-2d8e880c82e5363cf573a146d1d28f7ad23753f4.tar.xz nixpkgs-2d8e880c82e5363cf573a146d1d28f7ad23753f4.tar.zst nixpkgs-2d8e880c82e5363cf573a146d1d28f7ad23753f4.zip | |
blender: Update to 2.71
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 930a48a617f..a8eb527a97d 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "blender-2.70a"; + name = "blender-2.71"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "1rgkijn1nirj3jwh058zv6piw8q4j5wwjapgbvh2hh6fpbj84bgb"; + sha256 = "18pzcnrs4rcb6mf6aqr9xj2r05v8aay8daj31395ljfzw667zakx"; }; buildInputs = @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { opencolorio openexr openimageio openjpeg python zlib ] ++ stdenv.lib.optional jackaudioSupport jackaudio; + postUnpack = + '' + substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3 + ''; + cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f303f2004f..d128e171bef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8170,7 +8170,7 @@ let }; blender = callPackage ../applications/misc/blender { - python = python3; + python = python34; }; bristol = callPackage ../applications/audio/bristol { }; |