Unverified Commit de16a3d0 authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by GitHub
Browse files

blender: 4.4.1 -> 4.4.3; add updateScript; update OptiX to match upstream (#403769)

parents 9d4b0823 fd5cb169

pkgs/by-name/bl/blender/package.nix

+14 −6
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
  llvmPackages,

  makeWrapper,

  mesa,

  nix-update-script,

  openUsdSupport ? !stdenv.hostPlatform.isDarwin,

  openal,

  opencollada-blender,
@@ -104,20 +105,21 @@ let 
  });



  optix = fetchzip {

    # URL from https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/333add667b43255dcb011215a2d2af48281e83cf#9b9baac1eb9b72790eef5540a1685306fc43fd6c_30_30

    url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip";

    hash = "sha256-aMrp0Uff4c3ICRn4S6zedf6Q4Mc0/duBhKwKgYgMXVU=";

    # Look at upstream Blender BuildBot logs to determine the current version,

    # see Git blame here for historical details

    url = "https://developer.download.nvidia.com/redist/optix/v7.4/OptiX-7.4.0-Include.zip";

    hash = "sha256-ca08XetwaUYC9foeP5bff9kcDfuFgEzopvjspn2s8RY=";

  };

in



stdenv'.mkDerivation (finalAttrs: {

  pname = "blender";

  version = "4.4.1";

  version = "4.4.3";



  srcs = fetchzip {

  src = fetchzip {

    name = "source";

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

    hash = "sha256-5MsJ7UFpwwtaq905CiTkas/qPYOaeiacSSl3qu9h5w0=";

    hash = "sha256-vHDOKI7uqB5EbdRu711axBuYX1zM746E6GvK2Nl5hZg=";

  };



  patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
@@ -414,6 +416,12 @@ stdenv'.mkDerivation (finalAttrs: { 
        }], check=True)  # noqa: E501

      '';

    };



    updateScript = nix-update-script {

      extraArgs = [

        "--url=https://projects.blender.org/blender/blender"

      ];

    };

  };



  meta = {