diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-12-22 15:01:27 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-12-22 15:33:27 -0800 |
| commit | 807c0b0df59b597ed3682a06be00eb058b03bdb2 (patch) | |
| tree | 966843c54bb6577ed0dcbfd1375a896e9254e19a | |
| parent | fd4e4bd8bee303ac4756f806ec910f426fd5c447 (diff) | |
waffle: Add support for non-linux platforms
Waffle works perfectly well on macOS and Windows. Because the meson
options do proper dependency checking already, we can just leave them
out. This has the additional benefit of allowing gbm, surfaceless_egl
and x11_egl supoort to be built on Linux, which are useful in
conjunction with the piglit test suite.
| -rw-r--r-- | pkgs/development/libraries/waffle/default.nix | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index aa59bf6fb9e8..0f1e36b35795 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -4,15 +4,20 @@ , meson , ninja , libGL -, libglvnd +, libglvnd ? null , makeWrapper , pkg-config -, wayland -, libxcb -, libX11 , python3 +, x11Support ? true, libxcb ? null, libX11 ? null +, waylandSupport ? true, wayland ? null +, useGbm ? true, mesa ? null, libudev ? null }: +assert x11Support -> (libxcb != null && libX11 != null); +assert waylandSupport -> wayland != null; +assert useGbm -> (mesa != null && libudev != null); +assert with stdenv.hostPlatform; isUnix && !isDarwin -> libglvnd != null; + stdenv.mkDerivation rec { pname = "waffle"; version = "1.6.1"; @@ -27,10 +32,16 @@ stdenv.mkDerivation rec { buildInputs = [ libGL + ] ++ stdenv.lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [ libglvnd + ] ++ stdenv.lib.optionals x11Support [ libX11 libxcb + ] ++ stdenv.lib.optionals waylandSupport [ wayland + ] ++ stdenv.lib.optionals useGbm [ + mesa + libudev ]; nativeBuildInputs = [ @@ -41,10 +52,6 @@ stdenv.mkDerivation rec { python3 ]; - mesonFlags = [ - "-Dgbm=disabled" - ]; - postInstall = '' wrapProgram $out/bin/wflinfo \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} |