nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/egl-wayland/default.nix
View File

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

2
pkgs/development/libraries/wlroots/default.nix
View File

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

12
pkgs/servers/x11/xorg/xwayland.nix
View File

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