diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-14 15:05:55 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-14 15:13:39 +0200 |
commit | 54ae9d8527293cea6aee101531677d4495891056 (patch) | |
tree | 3d83931fe034b13a9793f1b8a9202ce41b69a97d /pkgs/applications | |
parent | 98f3e189f541f19a9d505bed7f87a0a10f5a0d5b (diff) | |
download | nixpkgs-54ae9d8527293cea6aee101531677d4495891056.tar nixpkgs-54ae9d8527293cea6aee101531677d4495891056.tar.gz nixpkgs-54ae9d8527293cea6aee101531677d4495891056.tar.bz2 nixpkgs-54ae9d8527293cea6aee101531677d4495891056.tar.lz nixpkgs-54ae9d8527293cea6aee101531677d4495891056.tar.xz nixpkgs-54ae9d8527293cea6aee101531677d4495891056.tar.zst nixpkgs-54ae9d8527293cea6aee101531677d4495891056.zip |
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)
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/blender/default.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 79f91a1df41..24a3fcd4cea 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" |