From fd4e4bd8bee303ac4756f806ec910f426fd5c447 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 22 Dec 2020 14:10:01 -0800 Subject: waffle: Use meson instead of cmake The cmake build system is deprecated upstream. --- pkgs/development/libraries/waffle/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index 66a1b7ab1450..aa59bf6fb9e8 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -1,7 +1,8 @@ { stdenv , fetchFromGitLab , lib -, cmake +, meson +, ninja , libGL , libglvnd , makeWrapper @@ -9,6 +10,7 @@ , wayland , libxcb , libX11 +, python3 }: stdenv.mkDerivation rec { @@ -32,12 +34,16 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake + meson + ninja makeWrapper pkg-config + python3 ]; - cmakeFlags = [ "-Dplatforms=x11,wayland" ]; + mesonFlags = [ + "-Dgbm=disabled" + ]; postInstall = '' wrapProgram $out/bin/wflinfo \ -- cgit v1.2.3