From 5b82c9d52cc1571da04057784c2cba941d0a7438 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 7 Apr 2023 21:36:23 +0000 Subject: [PATCH 1/2] gst_all_1.gst_editing_service: fix cross compilation python3 is used both during the build process (nativeBuildInputs) and #include'd/linked to by ges-formatter.c (buildInputs) --- pkgs/development/libraries/gstreamer/ges/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 63d477d6f91e..328c1830c701 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { pkg-config gettext gobject-introspection - gst-devtools python3 flex @@ -47,6 +46,8 @@ stdenv.mkDerivation rec { bash-completion libxml2 gobject-introspection + gst-devtools + python3 ]; propagatedBuildInputs = [ From ceb4451bcc678673123d1ea5fbd5789f3e26822b Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 7 Apr 2023 23:53:08 +0000 Subject: [PATCH 2/2] gst_all_1.vaapi: move `python3` to `nativeBuildInputs` to fix cross compilation --- pkgs/development/libraries/gstreamer/vaapi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 75c8fa25e2eb..faeffddfbf48 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config + python3 bzip2 # documentation @@ -62,7 +63,6 @@ stdenv.mkDerivation rec { libGLU nasm libvpx - python3 ]; mesonFlags = [