BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glmark2: switch to meson

Browse source 
The bundled waf is so old it doesn't support cross-compilation.
This commit is contained in:
Alyssa Ross 2023-02-26 23:04:39 +00:00
parent 3a518c1968
commit 48532d5957
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/graphics/glmark2/default.nix
View file

@ -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