Merge pull request #129135 from primeos/cross-compilation/wlroots

egl-wayland,xwayland,wlroots: support cross-compilation
This commit is contained in:
Michael Weiss 2021-07-03 16:40:13 +02:00 committed by GitHub
commit d295b05779
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions

View file

@ -4,6 +4,7 @@
, pkg-config
, meson
, ninja
, wayland-scanner
, libX11
, mesa
, libGL
@ -51,10 +52,15 @@ in stdenv.mkDerivation rec {
sha256 = "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk";
};
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
wayland-scanner
];
buildInputs = [

View file

@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
# $out for the library and $examples for the example programs (in examples):
outputs = [ "out" "examples" ];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
buildInputs = [

View file

@ -32,6 +32,7 @@
, stdenv
, wayland
, wayland-protocols
, wayland-scanner
, xkbcomp
, xkeyboard_config
, xorgproto
@ -47,7 +48,16 @@ stdenv.mkDerivation rec {
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
sha256 = "sha256-MfJhzlG77namyj7AKqNn/6K176K5hBLfV8zv16GQA84=";
};
nativeBuildInputs = [ pkg-config meson ninja ];
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
pkg-config
meson
ninja
wayland-scanner
];
buildInputs = [
egl-wayland
epoxy