JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,026 Commits 2 Branches 0 Tags 13 GiB
4c454a3208
Commit Graph

71 Commits

Author SHA1 Message Date
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02:00
Cillian de Róiste
49b23b29dd Blender: Tidy up, sort inputs, remove unused OPENJPEG option 2013-03-28 01:00:22 +01:00
Cillian de Róiste
ca2a39757c Blender: enable extra features in the Video Sequence Editor 
FFMPEG support allows a greater variety of export and import options.
SNDFILE support allows WAV and other sound file formats to be used.
JACK support allows blender to be used with XJadeo, Ardour or any other JACK away audio editor.
 2013-03-28 00:52:08 +01:00
Cillian de Róiste
64bc336f50 Blender 2.66 WIP 2013-03-27 22:25:33 +01:00
Vladimír Čunát
26e4a5561c blender: add the forgotten patch 2013-02-16 18:38:52 +01:00
Vladimír Čunát
08abf5a84a blender: minor update to work with libpng-1.6 
also other fixes needed in order to build
 2013-02-16 18:13:05 +01:00
Marc Weber
8cb034fd30 fix blender build and enable parallel building 2012-09-19 22:41:15 +02:00
Peter Simons
08b29c6f96 blender: update to version 2.63a 2012-07-07 11:31:32 +02:00
Lluís Batlle i Rossell
a9b800c8af Updating blender to 2.67. Maybe this will build in stdenv-updates too. 
I remove the blender 2.49; I think I don't need it anymore.


svn path=/nixpkgs/trunk/; revision=32599
 2012-02-26 20:47:12 +00:00
Cillian de Roiste
1cdd246d2b Updating Blender to the stable release 2.57 and adding python32 as a build input 
svn path=/nixpkgs/trunk/; revision=26894
 2011-04-19 20:17:17 +00:00
Lluís Batlle i Rossell
e47a2a9651 Adding blender 2.49, additional to the last 'alpha' 2.50 there already was in nixpkgs. 
I put the alpha in lowPrio too; too many things don't work still, there.

svn path=/nixpkgs/trunk/; revision=21701
 2010-05-10 10:20:51 +00:00
Lluís Batlle i Rossell
d770597dda I wrote a bad 'name' for blender before. Fixing. 
svn path=/nixpkgs/trunk/; revision=21674
 2010-05-08 22:33:20 +00:00
Lluís Batlle i Rossell
c82a9ac921 Updating blender 
svn path=/nixpkgs/trunk/; revision=21670
 2010-05-08 21:25:56 +00:00
Marc Weber
aa037e3af6 also use gcc-4.2 for blender. gcc-4.3 is causing another segfault. 
I haven't checked pre 2.49 though

svn path=/nixpkgs/trunk/; revision=15499
 2009-05-07 14:51:29 +00:00
Marc Weber
16ca65b0c2 blender update to 2.48 
adding some patches to compile dependencies and gav

svn path=/nixpkgs/trunk/; revision=15474
 2009-05-06 16:06:36 +00:00
Marc Weber
106c67b9db updated blender 
svn path=/nixpkgs/trunk/; revision=12180
 2008-06-24 01:57:12 +00:00
Marc Weber
bc8505609d blender compiles with physics engine now 
svn path=/nixpkgs/trunk/; revision=11826
 2008-05-14 13:39:20 +00:00
Yury G. Kudryashov
5bca69ac34 Nix-expr style review 
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
 2008-01-30 17:20:48 +00:00
Yury G. Kudryashov
8779bd4232 Removed unneeded cmake dependency for blender 
svn path=/nixpkgs/trunk/; revision=10332
 2008-01-28 19:39:27 +00:00
Marc Weber
30669073d5 blender default.nix 
svn path=/nixpkgs/trunk/; revision=9813
 2007-12-01 18:05:26 +00:00