From ed59f12ad5004f7918bc0228acee6fd576d0970d Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 31 May 2022 23:37:03 +0200 Subject: [PATCH 1/2] libshout: ensure pkg-config file is generated when cross-compiling --- pkgs/development/libraries/libshout/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 07025b26eea08..400c9b25f78c4 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ libvorbis libtheora speex ]; From 43edcbfc7393e9a385ff2d0c5c23412742fbb483 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 31 May 2022 23:38:32 +0200 Subject: [PATCH 2/2] gst_all_1.gst-plugins-good: support cross-compilation Enabling strictDeps verified by diffing with diffoscope. --- pkgs/development/libraries/gstreamer/good/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index a51936591a5cd..2d1144810b3a1 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -42,6 +42,7 @@ , xorg , libgudev , wavpack +, glib }: assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); @@ -57,6 +58,10 @@ stdenv.mkDerivation rec { sha256 = "1al4f35mx41cy2h6agvmsqkjfchsyfs0iyxzpv6pnl0xh9pqfriw"; }; + strictDeps = true; + + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ pkg-config python3 @@ -64,6 +69,9 @@ stdenv.mkDerivation rec { ninja gettext nasm + orc + libshout + glib ] ++ lib.optionals stdenv.isLinux [ wayland-protocols ];