Merge pull request #107429 from dcbaker/wip/2020-12/waffle-use-meson

Cleanups for waffle
This commit is contained in:
John Ericson 2020-12-22 18:56:19 -05:00 committed by GitHub
commit 2d2629f7d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,16 +1,23 @@
{ stdenv
, fetchFromGitLab
, lib
, cmake
, 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";
@ -25,20 +32,26 @@ 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 = [
cmake
meson
ninja
makeWrapper
pkg-config
python3
];
cmakeFlags = [ "-Dplatforms=x11,wayland" ];
postInstall = ''
wrapProgram $out/bin/wflinfo \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]}