From 48532d5957853537a7805fcd99602b91059e9e8f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Feb 2023 23:04:39 +0000 Subject: [PATCH] glmark2: switch to meson The bundled waf is so old it doesn't support cross-compilation. --- pkgs/tools/graphics/glmark2/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 5503e9eb38e0..20447a77eed3 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , pkg-config , makeWrapper +, meson +, ninja , libjpeg , libpng , xorg @@ -10,11 +12,9 @@ , libGL , libdrm , udev -, python3 , wayland , wayland-protocols , mesa -, wafHook }: stdenv.mkDerivation rec { @@ -28,21 +28,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-WCvc5GqrAdpIKQ4LVqwO6ZGbzBgLCl49NxiGJynIjSQ="; }; - nativeBuildInputs = [ pkg-config wafHook makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; buildInputs = [ libjpeg libpng xorg.libxcb libX11 libdrm - python3 udev wayland wayland-protocols mesa ]; - wafConfigureFlags = [ "--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2" ]; + mesonFlags = [ "-Dflavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2" ]; postInstall = '' for binary in $out/bin/glmark2*; do