wayland-scanner: use for nativeBuildInputs

This makes things more explicit (and less confusing) but only touches
the packages that I maintain.
This commit is contained in:
Michael Weiss 2021-07-03 17:02:23 +02:00
parent c5a4c4c68b
commit f7997354b7
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
14 changed files with 44 additions and 39 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc { lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner
, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam , pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0q48fgh6gf3jicy4bk3kq18h9lhqfq9qz32ri6j9ffvbb8mcw64s"; sha256 = "0q48fgh6gf3jicy4bk3kq18h9lhqfq9qz32ri6j9ffvbb8mcw64s";
}; };
nativeBuildInputs = [ meson pkg-config ninja scdoc wayland ]; nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ];
buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam ]; buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam ];
meta = with lib; { meta = with lib; {

View file

@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc { lib, stdenv, fetchFromGitHub
, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers , meson, ninja, pkg-config, scdoc, wayland-scanner
, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,9 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim"; sha256 = "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim";
}; };
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ];
buildInputs = [ buildInputs = [
wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers wayland wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers
]; ];
meta = with lib; { meta = with lib; {

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, meson, ninja, pkg-config, wayland, scdoc, makeWrapper , meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper
, wlroots, wayland-protocols, pixman, libxkbcommon , wlroots, wayland, wayland-protocols, pixman, libxkbcommon
, systemd, libGL, libX11, mesa , systemd, libGL, libX11, mesa
, xwayland ? null , xwayland ? null
, nixosTests , nixosTests
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "0vm96gxinhy48m3x9p1sfldyd03w3gk6iflb7n9kn06j1vqyswr6"; sha256 = "0vm96gxinhy48m3x9p1sfldyd03w3gk6iflb7n9kn06j1vqyswr6";
}; };
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc makeWrapper ];
buildInputs = [ buildInputs = [
wlroots wayland wayland-protocols pixman libxkbcommon wlroots wayland wayland-protocols pixman libxkbcommon

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg { lib, stdenv, fetchFromGitHub, substituteAll, swaybg
, meson, ninja, pkg-config, wayland, scdoc , meson, ninja, pkg-config, wayland-scanner, scdoc
, libxkbcommon, pcre, json_c, dbus, libevdev , wayland, libxkbcommon, pcre, json_c, dbus, libevdev
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
, wlroots, wayland-protocols, libdrm , wlroots, wayland-protocols, libdrm
, nixosTests , nixosTests
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkg-config wayland scdoc meson ninja pkg-config wayland-scanner scdoc
]; ];
buildInputs = [ buildInputs = [

View file

@ -1,4 +1,4 @@
{ lib, stdenv, wlroots, pkg-config { lib, stdenv, wlroots, pkg-config, wayland-scanner
, libxkbcommon, pixman, udev, wayland, wayland-protocols , libxkbcommon, pixman, udev, wayland, wayland-protocols
}: }:
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sourceRoot = "source/tinywl"; sourceRoot = "source/tinywl";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config wayland-scanner ];
buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ]; buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ];
installPhase = '' installPhase = ''
@ -20,7 +20,7 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl"; homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl";
description = ''"minimum viable product" Wayland compositor based on wlroots.''; description = ''A "minimum viable product" Wayland compositor based on wlroots'';
maintainers = with maintainers; [ qyliss ]; maintainers = with maintainers; [ qyliss ];
license = licenses.cc0; license = licenses.cc0;
inherit (wlroots.meta) platforms; inherit (wlroots.meta) platforms;

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland { lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner
, libGL, mesa, libxkbcommon, cairo, libxcb , wayland, libGL, mesa, libxkbcommon, cairo, libxcb
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
, colord, lcms2, pipewire ? null , colord, lcms2, pipewire ? null
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"; sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw";
}; };
nativeBuildInputs = [ meson ninja pkg-config wayland ]; nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
buildInputs = [ buildInputs = [
wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva

View file

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, meson, pkg-config, ninja, wayland { stdenv, lib, fetchFromGitHub, meson, pkg-config, ninja, wayland-scanner
, libdrm , libdrm
, minimal ? false, libva-minimal , minimal ? false, libva-minimal
, libX11, libXext, libXfixes, libffi, libGL , libX11, libXext, libXfixes, wayland, libffi, libGL
, mesa , mesa
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
outputs = [ "dev" "out" ]; outputs = [ "dev" "out" ];
nativeBuildInputs = [ meson pkg-config ninja wayland ]; nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ];
buildInputs = [ libdrm ] buildInputs = [ libdrm ]
++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ]; ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ];

View file

@ -16,6 +16,7 @@
, withWaylandTools ? stdenv.isLinux , withWaylandTools ? stdenv.isLinux
, wayland , wayland
, wayland-protocols , wayland-protocols
, wayland-scanner
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ pkg-config ]; depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config bison doxygen ] nativeBuildInputs = [ meson ninja pkg-config bison doxygen ]
++ lib.optional withWaylandTools wayland; ++ lib.optional withWaylandTools wayland-scanner;
buildInputs = [ xkeyboard_config libxcb libxml2 ] buildInputs = [ xkeyboard_config libxcb libxml2 ]
++ lib.optionals withWaylandTools [ wayland wayland-protocols ]; ++ lib.optionals withWaylandTools [ wayland wayland-protocols ];
checkInputs = [ python3 ]; checkInputs = [ python3 ];

View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, fetchpatch, buildPackages { stdenv, lib, fetchurl, fetchpatch, buildPackages
, meson, pkg-config, ninja , meson, pkg-config, ninja
, intltool, bison, flex, file, python3Packages , intltool, bison, flex, file, python3Packages, wayland-scanner
, expat, libdrm, xorg, wayland, wayland-protocols, openssl , expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva-minimal , llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau , libelf, libvdpau
@ -143,7 +143,7 @@ self = stdenv.mkDerivation {
intltool bison flex file intltool bison flex file
python3Packages.python python3Packages.Mako python3Packages.python python3Packages.Mako
] ++ lib.optionals (elem "wayland" eglPlatforms) [ ] ++ lib.optionals (elem "wayland" eglPlatforms) [
wayland # For wayland-scanner during the build wayland-scanner
]; ];
propagatedBuildInputs = with xorg; [ propagatedBuildInputs = with xorg; [

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl { lib, stdenv, fetchurl
, meson, pkg-config, ninja , meson, pkg-config, ninja, wayland-scanner
, wayland, wayland-protocols , wayland, wayland-protocols
}: }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4"; sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4";
}; };
nativeBuildInputs = [ meson pkg-config ninja wayland ]; nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ];
buildInputs = [ wayland wayland-protocols ]; buildInputs = [ wayland wayland-protocols ];
meta = with lib; { meta = with lib; {

View file

@ -3,6 +3,7 @@
, fetchFromSourcehut , fetchFromSourcehut
, pkg-config , pkg-config
, scdoc , scdoc
, wayland-scanner
, wayland , wayland
, wayland-protocols , wayland-protocols
, libxkbcommon , libxkbcommon
@ -19,8 +20,8 @@ stdenv.mkDerivation rec {
sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms"; sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms";
}; };
nativeBuildInputs = [ pkg-config scdoc wayland ]; nativeBuildInputs = [ pkg-config scdoc wayland-scanner ];
buildInputs = [ wayland-protocols libxkbcommon ]; buildInputs = [ wayland wayland-protocols libxkbcommon ];
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];

View file

@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, ninja, wayland, scdoc { lib, stdenv, fetchFromSourcehut
, wayland-protocols , meson, pkg-config, ninja, wayland-scanner, scdoc
, wayland, wayland-protocols
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0hhsddh3rs066rbsjksr8kcwg8lvglbvs67dq0r5wx5c1xcwb51w"; sha256 = "0hhsddh3rs066rbsjksr8kcwg8lvglbvs67dq0r5wx5c1xcwb51w";
}; };
nativeBuildInputs = [ meson pkg-config ninja wayland scdoc ]; nativeBuildInputs = [ meson pkg-config ninja wayland-scanner scdoc ];
buildInputs = [ wayland wayland-protocols ]; buildInputs = [ wayland wayland-protocols ];
meta = with lib; { meta = with lib; {

View file

@ -5,9 +5,10 @@
, ninja , ninja
, pkg-config , pkg-config
, scdoc , scdoc
, libseccomp , wayland-scanner
, wayland # wayland-scanner , wayland
, wayland-protocols , wayland-protocols
, libseccomp
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,8 +22,8 @@ stdenv.mkDerivation rec {
sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya"; sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya";
}; };
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
buildInputs = [ wayland-protocols ] buildInputs = [ wayland wayland-protocols ]
++ lib.optional stdenv.isLinux libseccomp; ++ lib.optional stdenv.isLinux libseccomp;
mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled";

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromSourcehut { lib, stdenv, fetchFromSourcehut
, meson, pkg-config, wayland, ninja , meson, pkg-config, wayland-scanner, ninja
, cairo, libinput, pango, wayland-protocols, libxkbcommon , cairo, libinput, pango, wayland, wayland-protocols, libxkbcommon
}: }:
let let
@ -17,8 +17,8 @@ in stdenv.mkDerivation rec {
sha256 = "10kafdja5cwbypspwhvaxjz3hvf51vqjzbgdasl977193cvxgmbs"; sha256 = "10kafdja5cwbypspwhvaxjz3hvf51vqjzbgdasl977193cvxgmbs";
}; };
nativeBuildInputs = [ meson pkg-config wayland ninja ]; nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ];
buildInputs = [ cairo libinput pango wayland-protocols libxkbcommon ]; buildInputs = [ cairo libinput pango wayland wayland-protocols libxkbcommon ];
meta = with lib; { meta = with lib; {
description = "Displays keys being pressed on a Wayland session"; description = "Displays keys being pressed on a Wayland session";