From ffed6bb86210102427d5014be53a5c6631a1d0f5 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 18 Feb 2023 12:43:05 -0500 Subject: [PATCH 1/3] gst_all_1.gst-plugins-good: allow rpicamsrc on 32-bit ARM rpicamsrc is supported on 32-bit ARM as well, but this was not allowed by the assertion. --- pkgs/development/libraries/gstreamer/good/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index aabd0058b260c..4f677cb64b9e2 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -45,7 +45,7 @@ , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc }: -assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); +assert raspiCameraSupport -> (stdenv.isLinux && (stdenv.isAarch32 || stdenv.isAarch64)); stdenv.mkDerivation rec { pname = "gst-plugins-good"; From 7d815275f63e274391a961b063db6c684c9cfe6e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 18 Feb 2023 12:53:45 -0500 Subject: [PATCH 2/3] gst_all_1.gst-plugins-good: fix building rpicamsrc The build script is unable to find the libraspberrypi libraries unless explicitly told their location. --- pkgs/development/libraries/gstreamer/good/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 4f677cb64b9e2..d042d55f82525 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -156,9 +156,11 @@ stdenv.mkDerivation rec { "-Dpulse=disabled" # TODO check if we can keep this enabled "-Dv4l2-gudev=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only - ] ++ lib.optionals (!raspiCameraSupport) [ + ] ++ (if raspiCameraSupport then [ + "-Drpi-lib-dir=${libraspberrypi}/lib" + ] else [ "-Drpicamsrc=disabled" - ]; + ]); postPatch = '' patchShebangs \ From d6fe1820db37a183b7eb3e007e2cba37204e286e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 19 Feb 2023 00:04:54 -0500 Subject: [PATCH 3/3] gst_all_1.gst-plugins-good: don't allow building rpicamsrc on aarch64 MMAL is not supported on 64-bit (see [1]), so rpicamsrc cannot be built on aarch64. [1] https://github.com/raspberrypi/userland/issues/688 --- pkgs/development/libraries/gstreamer/good/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index d042d55f82525..296473ef78fe5 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -45,7 +45,9 @@ , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc }: -assert raspiCameraSupport -> (stdenv.isLinux && (stdenv.isAarch32 || stdenv.isAarch64)); +# MMAL is not support on aarch64, see: +# https://github.com/raspberrypi/userland/issues/688 +assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good";