diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-12-22 14:10:01 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-12-22 15:33:27 -0800 |
| commit | fd4e4bd8bee303ac4756f806ec910f426fd5c447 (patch) | |
| tree | 0706d1b1765b517c1bea16b32c6bc8603b96abfb /pkgs/development/libraries/waffle | |
| parent | 3dfcc7e3a57268d06754b44bf89ff0b728df8de4 (diff) | |
| download | nixpkgs-fd4e4bd8bee303ac4756f806ec910f426fd5c447.tar nixpkgs-fd4e4bd8bee303ac4756f806ec910f426fd5c447.tar.gz nixpkgs-fd4e4bd8bee303ac4756f806ec910f426fd5c447.tar.bz2 nixpkgs-fd4e4bd8bee303ac4756f806ec910f426fd5c447.tar.lz nixpkgs-fd4e4bd8bee303ac4756f806ec910f426fd5c447.tar.xz nixpkgs-fd4e4bd8bee303ac4756f806ec910f426fd5c447.tar.zst nixpkgs-fd4e4bd8bee303ac4756f806ec910f426fd5c447.zip | |
waffle: Use meson instead of cmake
The cmake build system is deprecated upstream.
Diffstat (limited to 'pkgs/development/libraries/waffle')
| -rw-r--r-- | pkgs/development/libraries/waffle/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index 66a1b7ab145..aa59bf6fb9e 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 \ |