dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #105487 from kisik21/gst-plugins-good-aarch64

Browse Source 
gst-plugins-good: fix aarch64 builds and make raspi deps optional
This commit is contained in:
Niklas Hambüchen 2020-12-05 17:34:06 +01:00 committed by GitHub
commit f1651e1d83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -30,6 +30,7 @@
, mpg123 , mpg123
, twolame , twolame
, gtkSupport ? false, gtk3 ? null , gtkSupport ? false, gtk3 ? null
, raspiCameraSupport ? false, libraspberrypi ? null
, enableJack ? true, libjack2 , enableJack ? true, libjack2
, libXdamage , libXdamage
, libXext , libXext
@ -43,6 +44,7 @@
}: }:
assert gtkSupport -> gtk3 != null; assert gtkSupport -> gtk3 != null;
assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64);
let let
inherit (stdenv.lib) optionals; inherit (stdenv.lib) optionals;
@ -95,6 +97,8 @@ stdenv.mkDerivation rec {
xorg.libXfixes xorg.libXfixes
xorg.libXdamage xorg.libXdamage
wavpack wavpack
] ++ optionals raspiCameraSupport [
libraspberrypi
] ++ optionals gtkSupport [ ] ++ optionals gtkSupport [
# for gtksink # for gtksink
gtk3 gtk3
@ -128,8 +132,8 @@ stdenv.mkDerivation rec {
"-Dv4l2=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only
"-Dximagesrc=disabled" # Linux-only "-Dximagesrc=disabled" # Linux-only
"-Dpulse=disabled" # TODO check if we can keep this enabled "-Dpulse=disabled" # TODO check if we can keep this enabled
] ++ optionals (!(stdenv.isLinux && stdenv.hostPlatform.isAarch64)) [ ] ++ optionals (!raspiCameraSupport) [
"-Drpicamsrc=disabled" # only works on Linux aarch64, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/blob/428c9b60532917c0ac49c9d48b15bdcd00a1370b/sys/rpicamsrc/meson.build#L10 "-Drpicamsrc=disabled"
]; ];
postPatch = '' postPatch = ''