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

Merge pull request #232067 from claike/master 

blender: enable wayland
parents 3fedce78 01a31b8c

pkgs/applications/misc/blender/default.nix

+15 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
, spaceNavSupport ? stdenv.isLinux, libspnav

, makeWrapper

, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL

, waylandSupport ? stdenv.isLinux, pkg-config, wayland, wayland-protocols, libffi, libdecor, libxkbcommon, dbus

, potrace

, openxr-loader

, embree, gmp, libharu
@@ -36,8 +37,11 @@ stdenv.mkDerivation rec { 


  patches = lib.optional stdenv.isDarwin ./darwin.patch;



  nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ]

    ++ lib.optionals cudaSupport [ addOpenGLRunpath ];

  nativeBuildInputs =

    [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev

    ]

    ++ lib.optionals cudaSupport [ addOpenGLRunpath ]

    ++ lib.optionals waylandSupport [ pkg-config ];

  buildInputs =

    [ boost ffmpeg gettext glew ilmbase

      freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp
@@ -51,6 +55,9 @@ stdenv.mkDerivation rec { 
      libharu

      libepoxy

    ]

    ++ lib.optionals waylandSupport [

      wayland wayland-protocols libffi libdecor libxkbcommon dbus

    ]

    ++ lib.optionals (!stdenv.isAarch64) [

      openimagedenoise

      embree
@@ -124,6 +131,12 @@ stdenv.mkDerivation rec { 
      "-DWITH_IMAGE_OPENJPEG=ON"

      "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}"

    ]

    ++ lib.optionals waylandSupport [

      "-DWITH_GHOST_WAYLAND=ON"

      "-DWITH_GHOST_WAYLAND_DBUS=ON"

      "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF"

      "-DWITH_GHOST_WAYLAND_LIBDECOR=ON"

    ]

    ++ lib.optionals stdenv.hostPlatform.isAarch64 [

      "-DWITH_CYCLES_EMBREE=OFF"

    ]