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

python3.pkgs.pywayland: depend on wayland-scanner

Browse Source 
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.
This commit is contained in:
Alyssa Ross 2023-02-08 22:59:48 +00:00 committed by Florian Klink
parent 75ea55bdfe
commit bc10b4260d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/misc/qt-video-wlr/default.nix
View File

@ -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 let
gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
gstreamer gstreamer
@ -24,6 +24,7 @@ in stdenv.mkDerivation rec {
cmake # only used for find layer-shell-qt cmake # only used for find layer-shell-qt
ninja ninja
wrapQtAppsHook wrapQtAppsHook
wayland-scanner
]; ];
buildInputs = [ buildInputs = [

4
pkgs/development/python-modules/pywayland/default.nix
View File

@ -6,6 +6,7 @@
cffi, cffi,
pkg-config, pkg-config,
wayland, wayland,
wayland-scanner,
pytestCheckHook, pytestCheckHook,
}: }:
@ -19,7 +20,8 @@ buildPythonPackage rec {
hash = "sha256-WYreAng6rQWjKPZjtRtpTFq2i9XR4JJsDaPFISxWZTM="; hash = "sha256-WYreAng6rQWjKPZjtRtpTFq2i9XR4JJsDaPFISxWZTM=";
}; };
nativeBuildInputs = [ pkg-config ]; depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ pkg-config wayland-scanner ];
propagatedNativeBuildInputs = [ cffi ]; propagatedNativeBuildInputs = [ cffi ];
buildInputs = [ wayland ]; buildInputs = [ wayland ];
propagatedBuildInputs = [ cffi ]; propagatedBuildInputs = [ cffi ];