Unverified Commit 4dbf1080 authored by Florian Brandes's avatar Florian Brandes
Browse files

blender: format 



Signed-off-by: default avatarFlorian Brandes <florian.brandes@posteo.de>
parent 46861969

pkgs/applications/misc/blender/default.nix

+18 −15
Original line number Diff line number Diff line
@@ -183,7 +183,9 @@ stdenv.mkDerivation (finalAttrs: { 
      "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF"

      "-DWITH_GHOST_WAYLAND_LIBDECOR=ON"

    ]

    ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ "-DWITH_CYCLES_EMBREE=OFF" ]

    ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [

      "-DWITH_CYCLES_EMBREE=OFF"

    ]

    ++ lib.optionals stdenv.isDarwin [

      "-DLIBDIR=/does-not-exist"

      "-DWITH_CYCLES_OSL=OFF" # causes segfault on aarch64-darwin
@@ -326,7 +328,8 @@ stdenv.mkDerivation (finalAttrs: { 


  # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be

  # found. See the explanation in libglvnd.

  postFixup = lib.optionalString cudaSupport ''

  postFixup =

    lib.optionalString cudaSupport ''

      for program in $out/bin/blender $out/bin/.blender-wrapped; do

        isELF "$program" || continue

        addOpenGLRunpath "$program"
@@ -348,9 +351,7 @@ stdenv.mkDerivation (finalAttrs: { 
      };



    tests = {

      render = runCommand "${finalAttrs.pname}-test" {

        nativeBuildInputs = [ mesa.llvmpipeHook ];

      } ''

      render = runCommand "${finalAttrs.pname}-test" { nativeBuildInputs = [ mesa.llvmpipeHook ]; } ''

        set -euo pipefail

        cat <<'PYTHON' > scene-config.py

        import bpy
@@ -402,7 +403,9 @@ stdenv.mkDerivation (finalAttrs: { 
    # They comment two licenses: GPLv2 and Blender License, but they

    # say: "We've decided to cancel the BL offering for an indefinite period."

    # OptiX, enabled with cudaSupport, is non-free.

    license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport (unfree // { shortName = "NVidia OptiX EULA"; });

    license =

      with lib.licenses;

      [ gpl2Plus ] ++ lib.optional cudaSupport (unfree // { shortName = "NVidia OptiX EULA"; });



    platforms = [

      "aarch64-linux"