JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blender: Tidy up, sort inputs, remove unused OPENJPEG option

Browse Source
This commit is contained in:
Cillian de Róiste 2013-03-28 01:00:22 +01:00
parent ca2a39757c
commit 49b23b29dd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/misc/blender/default.nix
View File

@ -1,6 +1,8 @@
{ stdenv, fetchurl, SDL, cmake, ffmpeg, jackaudio, gettext, glew, ilmbase, libXi, libjpeg, { stdenv, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
libpng, libsamplerate, libsndfile, libtiff, mesa, opencolorio, openimageio, openal, openexr, openjpeg, , ilmbase, jackaudio, libXi, libjpeg, libpng, libsamplerate, libsndfile
python, zlib, boost }: , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
, zlib
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "blender-2.66a"; name = "blender-2.66a";
@ -10,8 +12,11 @@ stdenv.mkDerivation rec {
sha256 = "0wj8x9xk5irvsjc3rm7wzml1j47xcdpdpy84kidafk02biskcqcb"; sha256 = "0wj8x9xk5irvsjc3rm7wzml1j47xcdpdpy84kidafk02biskcqcb";
}; };
buildInputs = [ cmake mesa ffmpeg jackaudio gettext python glew libjpeg libpng zlib openal buildInputs = [
SDL openexr libsamplerate libsndfile libXi libtiff ilmbase opencolorio openimageio openjpeg boost ]; SDL boost cmake ffmpeg gettext glew ilmbase jackaudio libXi
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
opencolorio openexr openimageio openjpeg python zlib
];
cmakeFlags = [ cmakeFlags = [
@ -19,7 +24,6 @@ stdenv.mkDerivation rec {
"-DWITH_OPENCOLLADA=OFF" "-DWITH_OPENCOLLADA=OFF"
"-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_FFMPEG=ON"
"-DWITH_CODEC_SNDFILE=ON" "-DWITH_CODEC_SNDFILE=ON"
"-DWITH_SYSTEM_OPENJPEG=ON"
"-DWITH_JACK=ON" "-DWITH_JACK=ON"
"-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_INSTALL_PORTABLE=OFF"
"-DPYTHON_LIBRARY=python${python.majorVersion}m" "-DPYTHON_LIBRARY=python${python.majorVersion}m"