diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2023-05-16 09:35:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-16 09:35:27 -0400 |
| commit | 7c2a79ba2d16e9aa5b5d27ebd7609467698c2fed (patch) | |
| tree | 19aa29b756883f9319921b0f7285c88b92a787bf | |
| parent | python3Packages.publicsuffix2: restore original version number (#231610) (diff) | |
| parent | blender: enable wayland (diff) | |
| download | nixpkgs-7c2a79ba2d16e9aa5b5d27ebd7609467698c2fed.tar.gz | |
Merge pull request #232067 from claike/master
blender: enable wayland
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index a8cadffcf631..28e0ac94b347 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -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" ] |