From bc10b4260d0f4826f553b967ad87712ba6d85921 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 8 Feb 2023 22:59:48 +0000 Subject: [PATCH] python3.pkgs.pywayland: 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/qt-video-wlr/default.nix | 3 ++- pkgs/development/python-modules/pywayland/default.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qt-video-wlr/default.nix b/pkgs/applications/misc/qt-video-wlr/default.nix index 4ebd059c9274..dc634a8f2ad8 100644 --- a/pkgs/applications/misc/qt-video-wlr/default.nix +++ b/pkgs/applications/misc/qt-video-wlr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, meson, cmake, ninja, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia, layer-shell-qt }: +{ stdenv, lib, fetchFromGitHub, pkg-config, meson, cmake, ninja, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia, layer-shell-qt, wayland-scanner }: let gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ gstreamer @@ -24,6 +24,7 @@ in stdenv.mkDerivation rec { cmake # only used for find layer-shell-qt ninja wrapQtAppsHook + wayland-scanner ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index 35e3fe6133e4..f07d855fd615 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -6,6 +6,7 @@ cffi, pkg-config, wayland, + wayland-scanner, pytestCheckHook, }: @@ -19,7 +20,8 @@ buildPythonPackage rec { hash = "sha256-WYreAng6rQWjKPZjtRtpTFq2i9XR4JJsDaPFISxWZTM="; }; - nativeBuildInputs = [ pkg-config ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wayland-scanner ]; propagatedNativeBuildInputs = [ cffi ]; buildInputs = [ wayland ]; propagatedBuildInputs = [ cffi ];