summary refs log tree commit diff
diff options
context:
space:
mode:
authorLily Foster <lily@lily.flowers>2023-07-27 15:31:22 -0400
committerGitHub <noreply@github.com>2023-07-27 15:31:22 -0400
commit78faafa6e6684acd1ec9770161a85d3b83caf7c5 (patch)
tree00f4906d5da518d53abadfd0b4c26d5ac214d323
parentd044400c8060d9779a40f54d7feba1b8986b46cb (diff)
parentd6fe1820db37a183b7eb3e007e2cba37204e286e (diff)
downloadnixpkgs-78faafa6e6684acd1ec9770161a85d3b83caf7c5.tar
nixpkgs-78faafa6e6684acd1ec9770161a85d3b83caf7c5.tar.gz
nixpkgs-78faafa6e6684acd1ec9770161a85d3b83caf7c5.tar.bz2
nixpkgs-78faafa6e6684acd1ec9770161a85d3b83caf7c5.tar.lz
nixpkgs-78faafa6e6684acd1ec9770161a85d3b83caf7c5.tar.xz
nixpkgs-78faafa6e6684acd1ec9770161a85d3b83caf7c5.tar.zst
nixpkgs-78faafa6e6684acd1ec9770161a85d3b83caf7c5.zip
Merge pull request #217085 from lopsided98/gstreamer-rpicamsrc
gst_all_1.gst-plugins-good: fix building rpicamsrc
-rw-r--r--pkgs/development/libraries/gstreamer/good/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index aabd0058b26..296473ef78f 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.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";
@@ -156,9 +158,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 \