diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/graphics/glmark2/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/graphics/glmark2/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix index 9615b57e0c1a..bfcaa7154c0b 100644 --- a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix +++ b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix @@ -3,6 +3,9 @@ , fetchFromGitHub , pkg-config , makeWrapper +, meson +, ninja +, wayland-scanner , libjpeg , libpng , xorg @@ -10,39 +13,36 @@ , libGL , libdrm , udev -, python3 , wayland , wayland-protocols , mesa -, wafHook }: stdenv.mkDerivation rec { pname = "glmark2"; - version = "2021.12"; + version = "2023.01"; src = fetchFromGitHub { owner = "glmark2"; repo = "glmark2"; rev = version; - sha256 = "sha256-S6KkazkG+kdx02MPwrYvCFWSOtM6t5xT0OTE9PLCzas="; + sha256 = "sha256-WCvc5GqrAdpIKQ4LVqwO6ZGbzBgLCl49NxiGJynIjSQ="; }; - nativeBuildInputs = [ pkg-config wafHook makeWrapper ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper meson ninja wayland-scanner ]; 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=drm-gl,drm-glesv2,gbm-gl,gbm-glesv2,wayland-gl,wayland-glesv2,x11-gl,x11-gl-egl,x11-glesv2" ]; postInstall = '' for binary in $out/bin/glmark2*; do |