Commit Graph

123 Commits

Author SHA1 Message Date
Gabriel Ebner
64678850c9 blender: make darwin patch apply again 2021-04-03 15:16:43 +02:00
Gabriel Ebner
eae0b8fbfb blender: 2.91.0 -> 2.92.0 2021-04-03 11:57:13 +02:00
Gabriel Ebner
ab336074fd blender: enable spacenav support 2021-04-02 23:05:50 +02:00
illustris
8fe3b43891 blender: fix build error 2021-03-22 22:56:17 -04:00
sohalt
e7933ddd87 blender: support for libspnav 2021-02-18 15:08:20 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
github-actions[bot]
e251591528
Merge master into staging-next 2021-01-09 01:00:25 +00:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
NomisIV
952df7049b
Update pkgs/applications/misc/blender/default.nix
Co-authored-by: Pavol Rusnak <pavol@rusnak.io>
2020-12-30 18:01:16 +01:00
NomisIV
7eff6be40c blender: updated license, because of OptiX 2020-12-15 19:25:32 +01:00
NomisIV
49ce410158 blender: merged option optixSupport with cudaSupport 2020-12-15 19:10:38 +01:00
NomisIV
8b41a83a35 blender: add option for OptiX 2020-12-14 09:41:47 +01:00
Dmitry Kalinkin
492f3b80ab
blender: fix on darwin 2020-11-26 14:51:18 -05:00
Dmitry Kalinkin
d9d8c8a7fc
blender: use ffmpeg instead of ffmpeg_3
build_files/cmake/Modules/FindFFmpeg.cmake currently searches for
libavcodec/ac3_parser.h which is not present in ffmpeg_3 (at least on
darwin).
2020-11-26 14:49:54 -05:00
tilpner
57da6df40f
blender: 2.90.1 -> 2.91.0 2020-11-25 21:47:35 +01:00
Andrew Valencik
075014385e blender: 2.90.0 -> 2.90.1 2020-09-27 22:40:55 -04:00
Gabriel Ebner
6b74f99abd blender: 2.83.5 -> 2.90.0 2020-09-18 15:19:57 +02:00
R. RyanTM
1c5d2884b1
blender: 2.83.4 -> 2.83.5 (#96214) 2020-08-24 22:10:50 -04:00
R. RyanTM
87911328d4 blender: 2.83.3 -> 2.83.4 2020-08-13 02:14:18 +00:00
R. RyanTM
5891c750ed blender: 2.83.1 -> 2.83.3 2020-07-31 16:07:37 +00:00
Dmitry Kalinkin
5760e275f4
blender: don't require python3.7m on darwin
python is currently pointing to the python38, so this patches the
required version to match python version that is provided to the
expression. The m prefix denotes the pymalloc ABI for python 3.7 and
older, but is not provided starting python 3.8.
2020-06-30 22:27:08 -04:00
R. RyanTM
8ca6d3801a blender: 2.83.0 -> 2.83.1 2020-06-30 23:39:50 +00:00
Frederik Rietdijk
1523382160 Merge master into staging-next 2020-06-13 11:02:21 +02:00
Frederik Rietdijk
98f95ef9c4 blender: fix build with python 3.8
Since Python 3.8 an `m` is no longer added when pymalloc is used.
https://bugs.python.org/issue36707
2020-06-12 22:00:09 +02:00
Doron Behar
01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Dmitry Kalinkin
3d6ea5fd08
blender: add veprbl to maintainers 2020-06-09 11:56:50 -04:00
R. RyanTM
e49189078f
blender: 2.82a -> 2.83.0
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-06-09 11:55:48 -04:00
LeshaInc
3c54b996ca
blender: build with OpenImageDenoise support 2020-03-18 12:58:12 +02:00
R. RyanTM
4d8cac34f7
blender: 2.82 -> 2.82a (#82450) 2020-03-13 20:12:28 -04:00
Murray Campbell
fd614a72e9
blender: use PYTHONPATH (#82341)
See [blender patch](https://developer.blender.org/D6598)
2020-03-12 14:41:25 -04:00
Dmitry Kalinkin
27578856bf
blender: fix enableNumpy option, enable it unconditionally
Workarounds https://developer.blender.org/T74304

Audaspace requires numpy, we already have to provide numpy
unconditionally via PYTHON_NUMPY_PATH.
2020-02-29 14:19:11 -05:00
Gabriel Ebner
128c99978d blender: enable alembic 2020-02-23 12:10:53 +01:00
Dmitry Kalinkin
ac560382c5
blender: fix build on darwin
We don't compile blender with alembic. The linux build is able to detect
that, but this is not done for darwin. This explicitly disables alembic
to fix blender build on darwin.
2020-02-15 06:39:27 -05:00
R. RyanTM
8a2c2e48b4 blender: 2.81a -> 2.82 2020-02-15 01:46:17 +00:00
Dmitry Kalinkin
8aa0e2fe1d
blender: switch from openimageio to openimageio2 2020-01-10 13:55:49 -05:00
Dmitry Kalinkin
2287d54e7d
blender: fix on darwin
This enables building of Blender.app. The standard build process assumes
that the dependencies are installed in subdirectoris inside $LIBDIR with
libraries built as static. In current implementation we are not looking
to achieve portability, so cmake files are patched to link dynamically
with the libraries in the nix store. Linking to the transitive
dependencies is not needed in the shared case. There are also some minor
inconsistensies in the expected paths, which also need to be patched.

Alternatively, we could patch cmake files to treat darwin as "unix", but
that would require more tweaking to ensure that the frameworks are being
linked properly.
2020-01-09 02:54:50 -05:00
Dmitry Kalinkin
e57392dbc2
blender: switch to OpenJPEG 2.x
Fixes:

-- Could NOT find OpenJPEG (missing: OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR)

and

  - WITH_IMAGE_OPENJPEG         OFF
2020-01-09 02:53:06 -05:00
R. RyanTM
dfa93d552c blender: 2.81 -> 2.81a 2019-12-22 20:36:57 -08:00
Frederik Rietdijk
1d18c5a0fe Merge staging-next into staging 2019-11-24 10:13:31 +01:00
Gabriel Ebner
cc8ddeefea blender: 2.80 -> 2.81 2019-11-21 20:25:07 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Edmund Wu
67209e1b20
blender: 2.97b -> 2.80 2019-08-02 08:58:49 -04:00
Ambroz Bizjak
28a0918916 Add driver library path to some packages to find CUDA libraries.
This is to avoid relying on LD_LIBRARY_PATH for finding the CUDA driver libraries.
2019-05-22 18:34:09 +02:00
Jan Malakhovski
11b6496557 blender: move defaults to package file 2019-02-03 15:32:13 +00:00
Edmund Wu
f97baf13b0 blender: fix python 2019-01-14 10:07:27 +01:00
Frederik Rietdijk
0a2caa41fe Python: drop python.majorVersion
Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`.
For implementation version, use `python.sourceVersion`.

Some expressions were broken. Those that were identified were fixed.

fixup major
2019-01-04 10:45:22 +01:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Eelco Dolstra
854e069107 blender: Optionally enable numpy support
This is required by some included addons (such as ANT landscape). Note
that we can't use -DWITH_PYTHON_INSTALL_NUMPY=ON because it's
conditional on -DWITH_PYTHON_INSTALL=ON.
2018-03-30 22:03:40 +02:00
Ryan Mulligan
1c7e358e3f blender: 2.79a -> 2.79b
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/blender/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender -h` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender --help` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py -h` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py --help` got 0 exit code
- ran `/nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b/bin/blender-thumbnailer.py help` got 0 exit code
- found 2.79b with grep in /nix/store/v357w3cwwln6lprqr3xss3jvgpp9gsm8-blender-2.79b
- directory tree listing: https://gist.github.com/31e73f72bba2c0103ef5f038b4346d34
2018-03-25 11:42:59 -07:00
Vladimír Čunát
565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00