commit e7cf3dc1ee1a22ffcb3716536eb1001fe3427711 · pyrox.dev/nixpkgs

pkgs/applications/misc/blender/darwin.patch pkgs/by-name/bl/blender/darwin.patch

+10 -41

pkgs/applications/misc/blender/default.nix pkgs/by-name/bl/blender/package.nix

···

       18
        
         cudaSupport ? config.cudaSupport,

     

       19
        
         dbus,

     

       20
        
         embree,

     

       21
       -
         fetchgit,

     

       22
       -
         fetchpatch2,

     

       23
        
         fetchzip,

     

       24
        
         ffmpeg,

     

       25
        
         fftw,

     
···

       56
        
         makeWrapper,

     

       57
        
         mesa,

     

       58
        
         openal,

     

       59
       -
         opencollada,

     

       60
        
         opencolorio,

     

       61
        
         openexr,

     

       62
        
         openimagedenoise,

     
···

       114
        
       

     

       115
        
       stdenv'.mkDerivation (finalAttrs: {

     

       116
        
         pname = "blender";

     

       117
       -
         version = "4.3.2";

     

       118
        
       

     

       119
       -
         srcs = [

     

       120
       -
           (fetchzip {

     

       121
       -
             name = "source";

     

       122
       -
             url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";

     

       123
       -
             hash = "sha256-LCU2JpQbvQ+W/jC+H8J2suh+X5sTLOG9TcE2EeHqVh4=";

     

       124
       -
           })

     

       125
       -
           (fetchgit {

     

       126
       -
             name = "assets";

     

       127
       -
             url = "https://projects.blender.org/blender/blender-assets.git";

     

       128
       -
             rev = "v${finalAttrs.version}";

     

       129
       -
             fetchLFS = true;

     

       130
       -
             hash = "sha256-B/UibETNBEUAO1pLCY6wR/Mmdk2o9YyNs6z6pV8dBJI=";

     

       131
       -
           })

     

       132
       -
         ];

     

       133
        
       

     

       134
       -
         postUnpack = ''

     

       135
       -
           chmod -R u+w *

     

       136
       -
           rm -r assets/working

     

       137
       -
           mv assets --target-directory source/release/datafiles/

     

       138
       -
         '';

     

       139
       -
       

     

       140
       -
         sourceRoot = "source";

     

       141
       -
       

     

       142
       -
         patches = [

     

       143
       -
           ./draco.patch

     

       144
       -
           (fetchpatch2 {

     

       145
       -
             url = "https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/raw/4b6214600e11851d7793256e2f6846a594e6f223/ffmpeg-7-1.patch";

     

       146
       -
             hash = "sha256-YXXqP/+79y3f41n3cJ3A1RBzgdoYqfKZD/REqmWYdgQ=";

     

       147
       -
           })

     

       148
       -
           (fetchpatch2 {

     

       149
       -
             url = "https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/raw/4b6214600e11851d7793256e2f6846a594e6f223/ffmpeg-7-2.patch";

     

       150
       -
             hash = "sha256-mF6IA/dbHdNEkBN5XXCRcLIZ/8kXoirNwq7RDuLRAjw=";

     

       151
       -
           })

     

       152
       -
         ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;

     

       153
        
       

     

       154
        
         postPatch =

     

       155
        
           (lib.optionalString stdenv.hostPlatform.isDarwin ''

     
···

       201
        
             "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}"

     

       202
        
             "-DWITH_OPENSUBDIV=ON"

     

       203
        
             "-DWITH_OPENVDB=ON"

     

       0
        
       
     

       204
        
             "-DWITH_PULSEAUDIO=OFF"

     

       205
        
             "-DWITH_PYTHON_INSTALL=OFF"

     

       206
        
             "-DWITH_PYTHON_INSTALL_NUMPY=OFF"

     
···

       330
        
             wayland

     

       331
        
             wayland-protocols

     

       332
        
           ]

     

       333
       -
           ++ lib.optional colladaSupport opencollada

     

       334
        
           ++ lib.optional jackaudioSupport libjack2

     

       335
        
           ++ lib.optional spaceNavSupport libspnav

     

       336
        
           ++ lib.optionals vulkanSupport [

     
···

       364
        
           lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       365
        
             mkdir $out/Applications

     

       366
        
             mv $out/Blender.app $out/Applications

     

       367
       -
           ''

     

       368
       -
           + lib.optionalString stdenv.hostPlatform.isLinux ''

     

       369
       -
             mv $out/share/blender/${lib.versions.majorMinor finalAttrs.version}/python{,-ext}

     

       370
        
           ''

     

       371
        
           + ''

     

       372
        
             buildPythonPath "$pythonPath"

···

       18
        
         cudaSupport ? config.cudaSupport,

     

       19
        
         dbus,

     

       20
        
         embree,

     

       0
        
       
     

       0
        
       
     

       21
        
         fetchzip,

     

       22
        
         ffmpeg,

     

       23
        
         fftw,

     
···

       54
        
         makeWrapper,

     

       55
        
         mesa,

     

       56
        
         openal,

     

       57
       +
         opencollada-blender,

     

       58
        
         opencolorio,

     

       59
        
         openexr,

     

       60
        
         openimagedenoise,

     
···

       112
        
       

     

       113
        
       stdenv'.mkDerivation (finalAttrs: {

     

       114
        
         pname = "blender";

     

       115
       +
         version = "4.4.0";

     

       116
        
       

     

       117
       +
         srcs = fetchzip {

     

       118
       +
           name = "source";

     

       119
       +
           url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";

     

       120
       +
           hash = "sha256-pAzOayAPyRYgTixAyg2prkUtI70uFulRuBYhgU9ZNw4=";

     

       121
       +
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       122
        
       

     

       123
       +
         patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       124
        
       

     

       125
        
         postPatch =

     

       126
        
           (lib.optionalString stdenv.hostPlatform.isDarwin ''

     
···

       172
        
             "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}"

     

       173
        
             "-DWITH_OPENSUBDIV=ON"

     

       174
        
             "-DWITH_OPENVDB=ON"

     

       175
       +
             "-DWITH_PIPEWIRE=OFF"

     

       176
        
             "-DWITH_PULSEAUDIO=OFF"

     

       177
        
             "-DWITH_PYTHON_INSTALL=OFF"

     

       178
        
             "-DWITH_PYTHON_INSTALL_NUMPY=OFF"

     
···

       302
        
             wayland

     

       303
        
             wayland-protocols

     

       304
        
           ]

     

       305
       +
           ++ lib.optional colladaSupport opencollada-blender

     

       306
        
           ++ lib.optional jackaudioSupport libjack2

     

       307
        
           ++ lib.optional spaceNavSupport libspnav

     

       308
        
           ++ lib.optionals vulkanSupport [

     
···

       336
        
           lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       337
        
             mkdir $out/Applications

     

       338
        
             mv $out/Blender.app $out/Applications

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       339
        
           ''

     

       340
        
           + ''

     

       341
        
             buildPythonPath "$pythonPath"

-33

pkgs/applications/misc/blender/draco.patch

···

       1
       -
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       -
       index 97596dbee8d..d1ad6ac5de0 100644

     

       3
       -
       --- a/CMakeLists.txt

     

       4
       -
       +++ b/CMakeLists.txt

     

       5
       -
       @@ -1237,13 +1237,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES        OFF)

     

       6
       -
        set_and_warn_dependency(WITH_PYTHON WITH_DRACO         OFF)

     

       7
       -
        set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID     OFF)

     

       8
       -
        

     

       9
       -
       -if(NOT WITH_PYTHON_MODULE)

     

       10
       -
       -  if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)

     

       11
       -
       -    message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")

     

       12
       -
       -    set(WITH_DRACO OFF)

     

       13
       -
       -  endif()

     

       14
       -
       -endif()

     

       15
       -
       -

     

       16
       -
        # enable boost for cycles, audaspace or i18n

     

       17
       -
        # otherwise if the user disabled

     

       18
       -
        

     

       19
       -
       diff --git a/scripts/addons_core/io_scene_gltf2/io/com/draco.py b/scripts/addons_core/io_scene_gltf2/io/com/draco.py

     

       20
       -
       index 75e23162c67..875596c3d2f 100644

     

       21
       -
       --- a/scripts/addons_core/io_scene_gltf2/io/com/draco.py

     

       22
       -
       +++ b/scripts/addons_core/io_scene_gltf2/io/com/draco.py

     

       23
       -
       @@ -31,8 +31,8 @@ def dll_path() -> Path:

     

       24
       -
            :return: DLL path.

     

       25
       -
            """

     

       26
       -
            lib_name = 'extern_draco'

     

       27
       -
       -    blender_root = Path(bpy.app.binary_path).parent

     

       28
       -
       -    python_lib = Path('{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version))

     

       29
       -
       +    blender_root = Path(bpy.app.binary_path).parent.parent

     

       30
       -
       +    python_lib = Path('share/blender/{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version))

     

       31
       -
            python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info)

     

       32
       -
        

     

       33
       -
            path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH')

pkgs/applications/misc/blender/libdecor.patch pkgs/by-name/bl/blender/libdecor.patch

pkgs/applications/misc/blender/test-cuda.py pkgs/by-name/bl/blender/test-cuda.py

pkgs/applications/misc/blender/wrapper.nix pkgs/by-name/bl/blender/wrapper.nix

+39

pkgs/by-name/op/opencollada-blender/package.nix

···

       1
       +
       {

     

       2
       +
         cmake,

     

       3
       +
         fetchFromGitHub,

     

       4
       +
         lib,

     

       5
       +
         libxml2,

     

       6
       +
         pcre,

     

       7
       +
         pkg-config,

     

       8
       +
         stdenv,

     

       9
       +
       }:

     

       10
       +
       

     

       11
       +
       stdenv.mkDerivation {

     

       12
       +
         pname = "opencollada";

     

       13
       +
         version = "unstable-2025-01-30";

     

       14
       +
       

     

       15
       +
         src = fetchFromGitHub {

     

       16
       +
           owner = "aras-p";

     

       17
       +
           repo = "OpenCOLLADA";

     

       18
       +
           rev = "4526eb8aaa6462c71fbedd23103976c151a01c50";

     

       19
       +
           sha256 = "sha256-ctr+GjDzxOJxBfaMwjwayPkAOcF+FMsP1X72QCOwvTY=";

     

       20
       +
         };

     

       21
       +
       

     

       22
       +
         nativeBuildInputs = [

     

       23
       +
           cmake

     

       24
       +
           pkg-config

     

       25
       +
         ];

     

       26
       +
       

     

       27
       +
         propagatedBuildInputs = [

     

       28
       +
           libxml2

     

       29
       +
           pcre

     

       30
       +
         ];

     

       31
       +
       

     

       32
       +
         meta = {

     

       33
       +
           description = "Library for handling the COLLADA file format";

     

       34
       +
           homepage = "https://github.com/KhronosGroup/OpenCOLLADA/";

     

       35
       +
           maintainers = [ lib.maintainers.amarshall ];

     

       36
       +
           platforms = lib.platforms.unix;

     

       37
       +
           license = lib.licenses.mit;

     

       38
       +
         };

     

       39
       +
       }

+14 -19

pkgs/by-name/op/opencollada/package.nix

···

       1
        
       {

     

       2
       -
         lib,

     

       3
       -
         stdenv,

     

       4
        
         fetchFromGitHub,

     

       5
        
         fetchurl,

     

       6
       -
         cmake,

     

       7
       -
         pkg-config,

     

       8
        
         libxml2,

     

       9
        
         pcre,

     

       10
       -
         darwin,

     

       0
        
       
     

       11
        
       }:

     

       12
        
       

     

       13
        
       stdenv.mkDerivation rec {

     

       14
        
         pname = "opencollada";

     

       15
       -
       

     

       16
        
         version = "1.6.68";

     

       17
        
       

     

       18
        
         src = fetchFromGitHub {

     
···

       32
        
           })

     

       33
        
         ];

     

       34
        
       

     

       35
       -
         nativeBuildInputs = [

     

       36
       -
           cmake

     

       37
       -
           pkg-config

     

       38
       -
         ];

     

       39
       -
         buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (

     

       40
       -
           with darwin.apple_sdk.frameworks; [ AGL ]

     

       41
       -
         );

     

       42
       -
       

     

       43
       -
         propagatedBuildInputs = [

     

       44
       -
           libxml2

     

       45
       -
           pcre

     

       46
       -
         ];

     

       47
       -
       

     

       48
        
         postPatch =

     

       49
        
           ''

     

       50
        
             # Drop blanket -Werror as it tends to fail on newer toolchain for

     
···

       55
        
             substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \

     

       56
        
               --replace math.h cmath

     

       57
        
           '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       58
        
       

     

       59
        
         meta = {

     

       60
        
           description = "Library for handling the COLLADA file format";

···

       1
        
       {

     

       2
       +
         cmake,

     

       0
        
       
     

       3
        
         fetchFromGitHub,

     

       4
        
         fetchurl,

     

       5
       +
         lib,

     

       0
        
       
     

       6
        
         libxml2,

     

       7
        
         pcre,

     

       8
       +
         pkg-config,

     

       9
       +
         stdenv,

     

       10
        
       }:

     

       11
        
       

     

       12
        
       stdenv.mkDerivation rec {

     

       13
        
         pname = "opencollada";

     

       0
        
       
     

       14
        
         version = "1.6.68";

     

       15
        
       

     

       16
        
         src = fetchFromGitHub {

     
···

       30
        
           })

     

       31
        
         ];

     

       32
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       33
        
         postPatch =

     

       34
        
           ''

     

       35
        
             # Drop blanket -Werror as it tends to fail on newer toolchain for

     
···

       40
        
             substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \

     

       41
        
               --replace math.h cmath

     

       42
        
           '';

     

       43
       +
       

     

       44
       +
         nativeBuildInputs = [

     

       45
       +
           cmake

     

       46
       +
           pkg-config

     

       47
       +
         ];

     

       48
       +
       

     

       49
       +
         propagatedBuildInputs = [

     

       50
       +
           libxml2

     

       51
       +
           pcre

     

       52
       +
         ];

     

       53
        
       

     

       54
        
         meta = {

     

       55
        
           description = "Library for handling the COLLADA file format";

+1 -1

pkgs/top-level/all-packages.nix

···

       12611
        
           pinentry = pinentry-curses;

     

       12612
        
         };

     

       12613
        
       

     

       12614
       -
         blender = callPackage  ../applications/misc/blender {

     

       12615
        
           openexr = openexr_3;

     

       12616
        
           python3Packages = python311Packages;

     

       12617
        
           inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL;

···

       12611
        
           pinentry = pinentry-curses;

     

       12612
        
         };

     

       12613
        
       

     

       12614
       +
         blender = callPackage  ../by-name/bl/blender/package.nix {

     

       12615
        
           openexr = openexr_3;

     

       12616
        
           python3Packages = python311Packages;

     

       12617
        
           inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL;