1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-16 09:53:17 +00:00
Commit graph

103 commits

Author SHA1 Message Date
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
Eelco Dolstra 9f4b1ee686 blender: 2.79 -> 2.79a 2018-03-01 19:53:34 +01:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Nikolay Amiantov 22b582821d blender: fix build with new cudatoolkit 2017-10-19 12:47:56 +03:00
Nikolay Amiantov 378bfba023 treewide: use default compiler for cuda 2017-10-19 12:47:30 +03:00
Eelco Dolstra afc0218ecd blender: Fix CUDA support
CUDA toolkit 8 doesn't support gcc 6, so we have to build opensubdiv
and blender with gcc 5.
2017-09-16 22:45:22 +02:00
Eelco Dolstra e3b562e0e2 blender: 2.78c -> 2.79 2017-09-13 09:54:42 +02:00
Cillian de Róiste 8fb5217cf7 blender metadata: fix homepage 2017-08-03 23:03:03 +02:00
Nikolay Amiantov fe33c28ec9 blender: fix libOpenCL path 2017-03-01 02:51:18 +03:00
Eelco Dolstra ffb0fb51d4 blender: 2.78b -> 2.78c 2017-02-28 17:50:42 +01:00
Eelco Dolstra c4fab214fa blender: 2.78a -> 2.78b 2017-02-11 22:17:28 +01:00
Eelco Dolstra 5926192e55 blender: 2.78 -> 2.78a 2016-11-01 22:52:48 +01:00
Eelco Dolstra 2537bc8546 blender: 2.77a -> 2.78
Also fix the openjpeg dependency (it has to be openjpeg 1), and use
jemalloc which is also what the upstream binaries use.
2016-09-30 21:49:14 +02:00
Eelco Dolstra 452afd1ed6 ilmbase: Use separate outputs 2016-09-01 18:57:43 +02:00
Nikolay Amiantov 5041e0eea9 blender: fix build, don't install builtin Python 2016-08-22 16:39:33 +03:00
Eelco Dolstra 9fa5c5d461 blender: 2.77 -> 2.77a 2016-04-08 19:58:04 +02:00
Eelco Dolstra 7f61c7289f blender: Disable i686-linux build
The openimageio dependency doesn't build on i686. But probably nobody
cares about running Blender on 32-bit anymore.

http://hydra.nixos.org/build/33602734
2016-03-25 16:44:02 +01:00
Eelco Dolstra 4f47fe2f9c blender: 2.76b -> 2.77 2016-03-22 21:33:54 +01:00
Eelco Dolstra 43147bedab blender: Update to 2.76b 2015-11-05 13:48:22 +01:00
Eelco Dolstra 5ea6330f77 blender: Update to 2.76 2015-10-12 20:05:35 +02:00
Bjørn Forsman 1357692555 blender: take unversioned cudatoolkit attr
Makes it less weird to do an override, if a user wants to use e.g. cuda
6.5 (also requires gcc 4.8).
2015-08-19 07:27:59 +02:00