From c18e0463fb591cfbd603697f172d40585511332b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 11 Feb 2023 11:17:38 +0000 Subject: [PATCH] latte-dock: depend on wayland-scanner Otherwise, wayland-scanner would be picked up from the wayland in buildInputs, which isn't cross-friendly and will stop working when we split wayland-scanner into a separate package. --- pkgs/applications/misc/latte-dock/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 0d17b129ac7a..a870a7fec3b0 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,6 +1,9 @@ -{ mkDerivation, lib, cmake, xorg, plasma-framework, plasma-wayland-protocols, fetchFromGitLab -, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, qtwayland, kcrash, knewstuff -, wayland, plasma-workspace, plasma-desktop }: +{ lib, mkDerivation, fetchFromGitLab +, cmake, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash +, knewstuff, wayland-scanner +, plasma-framework, plasma-wayland-protocols, plasma-workspace, plasma-desktop, qtwayland +, wayland, xorg +}: mkDerivation rec { pname = "latte-dock"; @@ -17,7 +20,7 @@ mkDerivation rec { buildInputs = [ plasma-framework plasma-wayland-protocols qtwayland xorg.libpthreadstubs xorg.libXdmcp xorg.libSM wayland plasma-workspace plasma-desktop ]; nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem - qtx11extras kcrash knewstuff ]; + qtx11extras kcrash knewstuff wayland-scanner ]; patches = [ ./0001-Disable-autostart.patch