diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2021-07-03 17:02:23 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2021-07-03 17:56:23 +0200 |
commit | f7997354b7ad18f68a80e2bb9b670f71d0667dbf (patch) | |
tree | 83aac841fe7ecf62fc337a6b36340e4c2686938e /pkgs/applications/window-managers | |
parent | c5a4c4c68bf41465bfc784334fe31b7152ac1dbb (diff) | |
download | nixpkgs-f7997354b7ad18f68a80e2bb9b670f71d0667dbf.tar nixpkgs-f7997354b7ad18f68a80e2bb9b670f71d0667dbf.tar.gz nixpkgs-f7997354b7ad18f68a80e2bb9b670f71d0667dbf.tar.bz2 nixpkgs-f7997354b7ad18f68a80e2bb9b670f71d0667dbf.tar.lz nixpkgs-f7997354b7ad18f68a80e2bb9b670f71d0667dbf.tar.xz nixpkgs-f7997354b7ad18f68a80e2bb9b670f71d0667dbf.tar.zst nixpkgs-f7997354b7ad18f68a80e2bb9b670f71d0667dbf.zip |
wayland-scanner: use for nativeBuildInputs
This makes things more explicit (and less confusing) but only touches the packages that I maintain.
Diffstat (limited to 'pkgs/applications/window-managers')
4 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index 7aabdf27197..963f8676883 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, wayland, scdoc, makeWrapper -, wlroots, wayland-protocols, pixman, libxkbcommon +, meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper +, wlroots, wayland, wayland-protocols, pixman, libxkbcommon , systemd, libGL, libX11, mesa , xwayland ? null , nixosTests @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0vm96gxinhy48m3x9p1sfldyd03w3gk6iflb7n9kn06j1vqyswr6"; }; - nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc makeWrapper ]; buildInputs = [ wlroots wayland wayland-protocols pixman libxkbcommon diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 4e91c35146f..92de633f0fa 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, substituteAll, swaybg -, meson, ninja, pkg-config, wayland, scdoc -, libxkbcommon, pcre, json_c, dbus, libevdev +, meson, ninja, pkg-config, wayland-scanner, scdoc +, wayland, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm , nixosTests @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - meson ninja pkg-config wayland scdoc + meson ninja pkg-config wayland-scanner scdoc ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/tinywl/default.nix b/pkgs/applications/window-managers/tinywl/default.nix index ea8a92615a4..965ec67b6e9 100644 --- a/pkgs/applications/window-managers/tinywl/default.nix +++ b/pkgs/applications/window-managers/tinywl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, wlroots, pkg-config +{ lib, stdenv, wlroots, pkg-config, wayland-scanner , libxkbcommon, pixman, udev, wayland, wayland-protocols }: @@ -8,7 +8,7 @@ stdenv.mkDerivation { sourceRoot = "source/tinywl"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wayland-scanner ]; buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ]; installPhase = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with lib; { 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 ]; license = licenses.cc0; inherit (wlroots.meta) platforms; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 3a11444bcf4..598e78be264 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland -, libGL, mesa, libxkbcommon, cairo, libxcb +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner +, wayland, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2, pipewire ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"; }; - nativeBuildInputs = [ meson ninja pkg-config wayland ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; buildInputs = [ wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva |