From 54ae9d8527293cea6aee101531677d4495891056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 14 Aug 2014 15:05:55 +0200 Subject: [PATCH] blender: fix build by dropping patch integrated upstream It no longer applied, and the CMakeLists.txt looked completely different. Such changes without any version bump... (sigh) --- pkgs/applications/misc/blender/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 79f91a1df418..24a3fcd4cea9 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -29,13 +29,6 @@ stdenv.mkDerivation rec { substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3 ''; - patches = [(fetchpatch { # fix parallel builds - url = "https://developer.blender.org/D619?download=true"; - sha256 = "18h4fqsbpwxzqz7qby18lrrbzqnyd5xnann3xcac5wddwv5wjb0f"; - name = "D619.diff"; - })]; - patchFlags = "-p0"; - cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF"