diff options
| author | Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> | 2026-05-22 21:18:15 +0200 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2026-05-24 10:19:47 +0100 |
| commit | dfb6f229e5f62de62723b8b8185678eade9107f9 (patch) | |
| tree | 1a24289b0575631406998f46f49672294304a46e /gnu/packages/graphics.scm | |
| parent | 1ceaf5f42746b2f106005e86bc24d40fb28a0a8a (diff) | |
gnu: blender: Update to 4.5.10.
* gnu/packages/graphics.scm (blender): Update to 4.5.10. Use
G-Expressions over all arguments entries.
[phases]{install-assets, link-python-binary}: New phases.
{wrap-bin}: Update phase.
[native-inputs]: Add pkg-config.
[inputs]: Add blender-assets, fftwf, shaderc, vulkan-headers, and
vulkan-loader.
Merges: guix/guix!8783
Fixes: guix/guix#8577
Closes: guix/guix!6746
Change-Id: I11098ad54d50c2b5217dc3d828a397478dfd5896
Reviewed-by: Hugo Buddelmeijer <hugo@buddelmeijer.nl>
Modified-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index ce9bdfb3792..80dccc1e19a 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> | 43 | ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> |
| 44 | ;;; Copyright © 2025 James Smith <jsubuntuxp@disroot.org> | 44 | ;;; Copyright © 2025 James Smith <jsubuntuxp@disroot.org> |
| 45 | ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org> | 45 | ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org> |
| 46 | ;;; Copyright © 2026 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> | ||
| 46 | ;;; | 47 | ;;; |
| 47 | ;;; This file is part of GNU Guix. | 48 | ;;; This file is part of GNU Guix. |
| 48 | ;;; | 49 | ;;; |
| @@ -725,14 +726,14 @@ typically encountered in feature film production.") | |||
| 725 | (define-public blender | 726 | (define-public blender |
| 726 | (package | 727 | (package |
| 727 | (name "blender") | 728 | (name "blender") |
| 728 | (version "3.6.23") ;4.2.x+ requires Python >= 3.12 | 729 | (version "4.5.10") ;5.1.x+ requires Python >= 3.13 |
| 729 | (source (origin | 730 | (source (origin |
| 730 | (method url-fetch) | 731 | (method url-fetch) |
| 731 | (uri (string-append "https://download.blender.org/source/" | 732 | (uri (string-append "https://download.blender.org/source/" |
| 732 | "blender-" version ".tar.xz")) | 733 | "blender-" version ".tar.xz")) |
| 733 | (sha256 | 734 | (sha256 |
| 734 | (base32 | 735 | (base32 |
| 735 | "16ah70kqznxz60n39d4hnlnwh1vi7xn9kx37di708n03l5bn6mmw")))) | 736 | "1z4sq4rmg5lx0502i2kgalmdyw3a4kc3lw70kwnwkih5wkjnrbyx")))) |
| 736 | (build-system cmake-build-system) | 737 | (build-system cmake-build-system) |
| 737 | (arguments | 738 | (arguments |
| 738 | (list | 739 | (list |
| @@ -759,37 +760,50 @@ typically encountered in feature film production.") | |||
| 759 | "-DWITH_SYSTEM_GLOG=ON" | 760 | "-DWITH_SYSTEM_GLOG=ON" |
| 760 | "-DWITH_SYSTEM_LZO=ON" | 761 | "-DWITH_SYSTEM_LZO=ON" |
| 761 | (string-append "-DPYTHON_LIBRARY=python" #$python-version) | 762 | (string-append "-DPYTHON_LIBRARY=python" #$python-version) |
| 762 | (string-append "-DPYTHON_LIBPATH=" | 763 | (string-append "-DPYTHON_LIBPATH=" #$python "/lib") |
| 763 | (assoc-ref %build-inputs "python") | 764 | (string-append "-DPYTHON_INCLUDE_DIR=" #$python |
| 764 | "/lib") | ||
| 765 | (string-append "-DPYTHON_INCLUDE_DIR=" | ||
| 766 | (assoc-ref %build-inputs "python") | ||
| 767 | "/include/python" #$python-version) | 765 | "/include/python" #$python-version) |
| 768 | (string-append "-DPYTHON_VERSION=" #$python-version) | 766 | (string-append "-DPYTHON_VERSION=" #$python-version) |
| 769 | (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS=" | 767 | (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS=" |
| 770 | (assoc-ref %build-inputs "python-numpy") | 768 | #$(this-package-input "python-numpy") |
| 771 | "/lib/python" #$python-version | 769 | "/lib/python" #$python-version |
| 772 | "/site-packages/numpy/core/include/") | 770 | "/site-packages/numpy/core/include/") |
| 773 | (string-append "-DPYTHON_NUMPY_PATH=" | 771 | (string-append "-DPYTHON_NUMPY_PATH=" |
| 774 | (assoc-ref %build-inputs "python-numpy") | 772 | #$(this-package-input "python-numpy") |
| 775 | "/lib/python" #$python-version | 773 | "/lib/python" #$python-version |
| 776 | "/site-packages/"))) | 774 | "/site-packages/"))) |
| 777 | #:phases | 775 | #:phases |
| 778 | #~(modify-phases %standard-phases | 776 | #~(modify-phases %standard-phases |
| 777 | (add-after 'unpack 'install-assets | ||
| 778 | (lambda _ | ||
| 779 | (copy-recursively #$(this-package-input "blender-assets") | ||
| 780 | "./release/datafiles/assets"))) | ||
| 781 | (add-after 'install 'link-python-binary | ||
| 782 | (lambda _ | ||
| 783 | (let* ((blender-dir (string-append #$output "/share/blender/" | ||
| 784 | #$(version-major+minor version))) | ||
| 785 | (blender-python-dir (string-append blender-dir "/python"))) | ||
| 786 | (mkdir-p blender-dir) | ||
| 787 | (symlink #$(this-package-input "python") | ||
| 788 | blender-python-dir)))) | ||
| 779 | (add-after 'install 'wrap-bin | 789 | (add-after 'install 'wrap-bin |
| 780 | (lambda* (#:key outputs #:allow-other-keys) | 790 | (lambda _ |
| 781 | (let* ((out (assoc-ref outputs "out")) | 791 | (let ((python-path (getenv "GUIX_PYTHONPATH"))) |
| 782 | (python-path (getenv "GUIX_PYTHONPATH"))) | 792 | (when python-path |
| 783 | (wrap-program (string-append out "/bin/blender") | 793 | (wrap-program (string-append #$output "/bin/blender") |
| 784 | `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))) | 794 | `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))) |
| 795 | (native-inputs | ||
| 796 | (list pkg-config)) | ||
| 785 | (inputs | 797 | (inputs |
| 786 | (list bash-minimal | 798 | (list bash-minimal |
| 799 | blender-assets | ||
| 787 | boost | 800 | boost |
| 788 | bullet | 801 | bullet |
| 789 | eigen | 802 | eigen |
| 790 | embree | 803 | embree |
| 791 | ffmpeg-6 | 804 | ffmpeg-6 |
| 792 | fftw | 805 | fftw |
| 806 | fftwf | ||
| 793 | freetype-with-brotli | 807 | freetype-with-brotli |
| 794 | glew | 808 | glew |
| 795 | glog | 809 | glog |
| @@ -817,6 +831,9 @@ typically encountered in feature film production.") | |||
| 817 | pugixml | 831 | pugixml |
| 818 | python | 832 | python |
| 819 | python-numpy-1 | 833 | python-numpy-1 |
| 834 | shaderc | ||
| 835 | vulkan-headers | ||
| 836 | vulkan-loader | ||
| 820 | zlib | 837 | zlib |
| 821 | `(,zstd "lib"))) | 838 | `(,zstd "lib"))) |
| 822 | (home-page "https://www.blender.org/") | 839 | (home-page "https://www.blender.org/") |
