Unverified Commit eb76ed54 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #326044 from amarshall/blender-correct-python-version

parents 0f1ab31e 36757e28

pkgs/applications/misc/blender/default.nix

+11 −0
Original line number Diff line number Diff line
@@ -198,6 +198,17 @@ stdenv.mkDerivation (finalAttrs: { 
      "-DWITH_CYCLES_DEVICE_OPTIX=ON"

    ];



  preConfigure = ''

    (

      expected_python_version=$(grep -E --only-matching 'set\(_PYTHON_VERSION_SUPPORTED [0-9.]+\)' build_files/cmake/Modules/FindPythonLibsUnix.cmake | grep -E --only-matching '[0-9.]+')

      actual_python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[0:2])))')

      if ! [[ "$actual_python_version" = "$expected_python_version" ]]; then

        echo "wrong Python version, expected '$expected_python_version', got '$actual_python_version'" >&2

        exit 1

      fi

    )

  '';



  nativeBuildInputs =

    [

      cmake

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -29554,6 +29554,7 @@ with pkgs; 














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















    openexr = openexr_3;













    python3Packages = python311Packages;















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















  };