From 13df10b931c68dc9a16475d4a3a8045cc7cea8b3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 6 Feb 2023 09:02:57 +0100 Subject: [PATCH] Revert "Revert "wayland: mark as broken on darwin"" --- pkgs/development/libraries/wayland/default.nix | 2 +- pkgs/top-level/all-packages.nix | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index bb764d641436b..8d229678a3c80 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -8,7 +8,7 @@ , wayland-scanner , expat , libxml2 -, withLibraries ? stdenv.isLinux +, withLibraries ? true , libffi , withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform , graphviz-nox diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65452c7ac96b8..dffc3bc082aca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9088,7 +9088,17 @@ with pkgs; memtester = callPackage ../tools/system/memtester { }; - mesa-demos = callPackage ../tools/graphics/mesa-demos { }; + mesa-demos = + let + wayland' = wayland.override { withLibraries = stdenv.isLinux; }; + in + callPackage ../tools/graphics/mesa-demos { + wayland = wayland'; + wayland-protocols = wayland-protocols.override { + wayland = wayland'; + wayland-scanner = wayland'.bin; + }; + }; mhonarc = perlPackages.MHonArc;