summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorLuca Bruno <lucabru@src.gnome.org>2015-01-13 21:33:14 +0100
committerLuca Bruno <lucabru@src.gnome.org>2015-01-13 21:35:22 +0100
commit5f12045f345609d288e6657c0ba251fb1a2cb46c (patch)
tree61301a82ab8bdf43a9af20f176ddf8dac78594ea /pkgs/applications
parentddf0804a87361cfa12851d0f84429822d9d0929f (diff)
downloadnixpkgs-5f12045f345609d288e6657c0ba251fb1a2cb46c.tar
nixpkgs-5f12045f345609d288e6657c0ba251fb1a2cb46c.tar.gz
nixpkgs-5f12045f345609d288e6657c0ba251fb1a2cb46c.tar.bz2
nixpkgs-5f12045f345609d288e6657c0ba251fb1a2cb46c.tar.lz
nixpkgs-5f12045f345609d288e6657c0ba251fb1a2cb46c.tar.xz
nixpkgs-5f12045f345609d288e6657c0ba251fb1a2cb46c.tar.zst
nixpkgs-5f12045f345609d288e6657c0ba251fb1a2cb46c.zip
blender: fix build after update to 2.73
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/misc/blender/default.nix7
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 4b4d41e29ee..654ce0d139e 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -17,12 +17,6 @@ stdenv.mkDerivation rec {
     sha256 = "140fcxjb73gim430v08021ls3civ3yghld63ljkgxi5vaww1cq95";
   };
 
-  patches = [(fetchpatch {
-    url = "https://raw.githubusercontent.com/Exherbo/media-unofficial/b5b09fa35ed/"
-      + "packages/media-gfx/blender/files/blender-2.71-Fix-build-with-freetype-2.5.4.patch";
-    sha256 = "19kx9h030zy2f0ah5v69ank2ak8gfp1zv26pm4ixngfdbsiy5lvk";
-  })];
-
   buildInputs =
     [ SDL boost cmake ffmpeg gettext glew ilmbase libXi
       libjpeg libpng libsamplerate libsndfile libtiff mesa openal
@@ -41,6 +35,7 @@ stdenv.mkDerivation rec {
     [ "-DWITH_MOD_OCEANSIM=ON"
       "-DWITH_CODEC_FFMPEG=ON"
       "-DWITH_CODEC_SNDFILE=ON"
+      "-DWITH_FFTW3=ON"
       "-DWITH_INSTALL_PORTABLE=OFF"
       "-DWITH_FFTW3=ON"
       "-DWITH_SDL=ON"