diff options
| author | Cillian de Róiste <goibhniu@fsfe.org> | 2013-03-28 01:00:22 +0100 |
|---|---|---|
| committer | Cillian de Róiste <goibhniu@fsfe.org> | 2013-03-28 01:00:22 +0100 |
| commit | 49b23b29dd84ff35a4ab1eb5bd9043e21e3f75e0 (patch) | |
| tree | fa6e787009d75a6d8133abac5771df5a74246559 /pkgs/applications/misc | |
| parent | ca2a39757c7850f2e7ec7a0b8eee6fb5ecc8e100 (diff) | |
| download | nixlib-49b23b29dd84ff35a4ab1eb5bd9043e21e3f75e0.tar nixlib-49b23b29dd84ff35a4ab1eb5bd9043e21e3f75e0.tar.gz nixlib-49b23b29dd84ff35a4ab1eb5bd9043e21e3f75e0.tar.bz2 nixlib-49b23b29dd84ff35a4ab1eb5bd9043e21e3f75e0.tar.lz nixlib-49b23b29dd84ff35a4ab1eb5bd9043e21e3f75e0.tar.xz nixlib-49b23b29dd84ff35a4ab1eb5bd9043e21e3f75e0.tar.zst nixlib-49b23b29dd84ff35a4ab1eb5bd9043e21e3f75e0.zip | |
Blender: Tidy up, sort inputs, remove unused OPENJPEG option
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 763a7c2a6e55..1ed51a81f5cc 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, SDL, cmake, ffmpeg, jackaudio, gettext, glew, ilmbase, libXi, libjpeg, -libpng, libsamplerate, libsndfile, libtiff, mesa, opencolorio, openimageio, openal, openexr, openjpeg, -python, zlib, boost }: +{ stdenv, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew +, ilmbase, jackaudio, libXi, libjpeg, libpng, libsamplerate, libsndfile +, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python +, zlib +}: stdenv.mkDerivation rec { name = "blender-2.66a"; @@ -10,8 +12,11 @@ stdenv.mkDerivation rec { sha256 = "0wj8x9xk5irvsjc3rm7wzml1j47xcdpdpy84kidafk02biskcqcb"; }; - buildInputs = [ cmake mesa ffmpeg jackaudio gettext python glew libjpeg libpng zlib openal - SDL openexr libsamplerate libsndfile libXi libtiff ilmbase opencolorio openimageio openjpeg boost ]; + buildInputs = [ + SDL boost cmake ffmpeg gettext glew ilmbase jackaudio libXi + libjpeg libpng libsamplerate libsndfile libtiff mesa openal + opencolorio openexr openimageio openjpeg python zlib + ]; cmakeFlags = [ @@ -19,7 +24,6 @@ stdenv.mkDerivation rec { "-DWITH_OPENCOLLADA=OFF" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" - "-DWITH_SYSTEM_OPENJPEG=ON" "-DWITH_JACK=ON" "-DWITH_INSTALL_PORTABLE=OFF" "-DPYTHON_LIBRARY=python${python.majorVersion}m" |