gst_all_1: re-disable docs for cross

Documentation was recently enabled, which broke the cross build.

Fixes: 46bf2c47f0 ("gst_all_1.gst-editing-services: 1.20.3 -> 1.22.2")
Fixes: 782969f5d6 ("gst_all_1.gst-rtsp-server: 1.20.3 -> 1.22.2")
Fixes: 79e42f53c2 ("gst_all_1.gst-devtools: 1.20.3 -> 1.22.2")
Fixes: 50b8c274ea ("gst_all_1.gst-vaapi: 1.20.3 -> 1.22.2")
Fixes: 26a54eba11 ("gst_all_1.gst-libav: 1.20.3 -> 1.22.2")
Fixes: a315e09637 ("gst_all_1.gst-plugins-ugly: 1.20.3 -> 1.22.2")
Fixes: f03d8ba1e1 ("gst_all_1.gst-plugins-bad: 1.20.3 -> 1.22.2")
Fixes: 3028bf5ea3 ("gst_all_1.gst-plugins-good: 1.20.3 -> 1.22.2")
Fixes: 4b859ee802 ("gst_all_1.gstreamer: 1.20.3 -> 1.22.2")
This commit is contained in:
Alyssa Ross 2023-04-18 23:23:00 +00:00
parent 9f32e0df84
commit 4705a06cc0
No known key found for this signature in database
GPG key ID: F9DBED4859B271C0
10 changed files with 54 additions and 32 deletions

View file

@ -11,7 +11,6 @@
, orc , orc
, gstreamer , gstreamer
, gobject-introspection , gobject-introspection
, hotdoc
, enableZbar ? false , enableZbar ? false
, faacSupport ? false , faacSupport ? false
, faac , faac
@ -101,6 +100,8 @@
, MediaToolbox , MediaToolbox
, enableGplPlugins ? true , enableGplPlugins ? true
, bluezSupport ? stdenv.isLinux , bluezSupport ? stdenv.isLinux
# Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -131,8 +132,7 @@ stdenv.mkDerivation rec {
gettext gettext
gstreamer # for gst-tester-1.0 gstreamer # for gst-tester-1.0
gobject-introspection gobject-introspection
] ++ lib.optionals enableDocumentation [
# documentation
hotdoc hotdoc
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
wayland # for wayland-scanner wayland # for wayland-scanner
@ -287,6 +287,7 @@ stdenv.mkDerivation rec {
"-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing
"-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx` "-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx`
"-Dbluez=${if bluezSupport then "enabled" else "disabled"}" "-Dbluez=${if bluezSupport then "enabled" else "disabled"}"
(lib.mesonEnable "doc" enableDocumentation)
] ]
++ lib.optionals (!stdenv.isLinux) [ ++ lib.optionals (!stdenv.isLinux) [
"-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only

View file

@ -20,7 +20,6 @@
, tremor # provides 'virbisidec' , tremor # provides 'virbisidec'
, libGL , libGL
, gobject-introspection , gobject-introspection
, hotdoc
, enableX11 ? stdenv.isLinux , enableX11 ? stdenv.isLinux
, libXext , libXext
, libXi , libXi
@ -39,6 +38,9 @@
, cdparanoia , cdparanoia
, glib , glib
, testers , testers
# Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform
, hotdoc
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -68,10 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
glib glib
gstreamer gstreamer
gobject-introspection gobject-introspection
] ++ lib.optionals enableDocumentation [
# documentation
hotdoc hotdoc
] ++ lib.optional enableWayland wayland; ] ++ lib.optionals enableWayland [
wayland
];
buildInputs = [ buildInputs = [
gobject-introspection gobject-introspection
@ -110,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
# See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
"-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}"
(lib.mesonEnable "doc" enableDocumentation)
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-Dtests=disabled" "-Dtests=disabled"
] ]

View file

@ -8,7 +8,6 @@
, flex , flex
, python3 , python3
, glib , glib
, hotdoc
, makeWrapper , makeWrapper
, libcap , libcap
, libunwind , libunwind
@ -19,6 +18,8 @@
, CoreServices , CoreServices
, gobject-introspection , gobject-introspection
, testers , testers
# Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -55,11 +56,10 @@ stdenv.mkDerivation (finalAttrs: {
glib glib
bash-completion bash-completion
gobject-introspection gobject-introspection
# documentation
hotdoc
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
libcap # for setcap binary libcap # for setcap binary
] ++ lib.optionals enableDocumentation [
hotdoc
]; ];
buildInputs = [ buildInputs = [
@ -81,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
mesonFlags = [ mesonFlags = [
"-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
(lib.mesonEnable "doc" enableDocumentation)
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
# darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it.
"-Dlibunwind=disabled" "-Dlibunwind=disabled"

View file

@ -10,8 +10,9 @@
, gst-rtsp-server , gst-rtsp-server
, python3 , python3
, gobject-introspection , gobject-introspection
, hotdoc
, json-glib , json-glib
# Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -37,8 +38,7 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
gobject-introspection gobject-introspection
] ++ lib.optionals enableDocumentation [
# documentation
hotdoc hotdoc
]; ];
@ -56,6 +56,10 @@ stdenv.mkDerivation rec {
gst-rtsp-server gst-rtsp-server
]; ];
mesonFlags = [
(lib.mesonEnable "doc" enableDocumentation)
];
meta = with lib; { meta = with lib; {
description = "Integration testing infrastructure for the GStreamer framework"; description = "Integration testing infrastructure for the GStreamer framework";
homepage = "https://gstreamer.freedesktop.org"; homepage = "https://gstreamer.freedesktop.org";

View file

@ -10,9 +10,10 @@
, gst-devtools , gst-devtools
, libxml2 , libxml2
, flex , flex
, hotdoc
, gettext , gettext
, gobject-introspection , gobject-introspection
# Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -37,8 +38,7 @@ stdenv.mkDerivation rec {
gobject-introspection gobject-introspection
python3 python3
flex flex
] ++ lib.optionals enableDocumentation [
# documentation
hotdoc hotdoc
]; ];
@ -55,6 +55,10 @@ stdenv.mkDerivation rec {
gst-plugins-bad gst-plugins-bad
]; ];
mesonFlags = [
(lib.mesonEnable "doc" enableDocumentation)
];
postPatch = '' postPatch = ''
patchShebangs \ patchShebangs \
scripts/extract-release-date-from-doap-file.py scripts/extract-release-date-from-doap-file.py

View file

@ -44,7 +44,8 @@
, libgudev , libgudev
, wavpack , wavpack
, glib , glib
, hotdoc # Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
}: }:
assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
@ -74,8 +75,7 @@ stdenv.mkDerivation rec {
orc orc
libshout libshout
glib glib
] ++ lib.optionals enableDocumentation [
# documentation
hotdoc hotdoc
] ++ lib.optionals qt5Support (with qt5; [ ] ++ lib.optionals qt5Support (with qt5; [
qtbase qtbase
@ -142,6 +142,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
"-Dglib-asserts=disabled" # asserts should be disabled on stable releases "-Dglib-asserts=disabled" # asserts should be disabled on stable releases
(lib.mesonEnable "doc" enableDocumentation)
] ++ lib.optionals (!qt5Support) [ ] ++ lib.optionals (!qt5Support) [
"-Dqt5=disabled" "-Dqt5=disabled"
] ++ lib.optionals (!qt6Support) [ ] ++ lib.optionals (!qt6Support) [

View file

@ -5,11 +5,12 @@
, ninja , ninja
, pkg-config , pkg-config
, python3 , python3
, hotdoc
, gstreamer , gstreamer
, gst-plugins-base , gst-plugins-base
, gettext , gettext
, libav , libav
# Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
}: }:
# Note that since gst-libav-1.6, libav is actually ffmpeg. See # Note that since gst-libav-1.6, libav is actually ffmpeg. See
@ -32,8 +33,7 @@ stdenv.mkDerivation rec {
gettext gettext
pkg-config pkg-config
python3 python3
] ++ lib.optionals enableDocumentation [
# documentation
hotdoc hotdoc
]; ];
@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
libav libav
]; ];
mesonFlags = [
(lib.mesonEnable "doc" enableDocumentation)
];
postPatch = '' postPatch = ''
patchShebangs \ patchShebangs \
scripts/extract-release-date-from-doap-file.py scripts/extract-release-date-from-doap-file.py

View file

@ -5,11 +5,12 @@
, ninja , ninja
, pkg-config , pkg-config
, python3 , python3
, hotdoc
, gettext , gettext
, gobject-introspection , gobject-introspection
, gst-plugins-base , gst-plugins-base
, gst-plugins-bad , gst-plugins-bad
# Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -33,8 +34,7 @@ stdenv.mkDerivation rec {
gobject-introspection gobject-introspection
pkg-config pkg-config
python3 python3
] ++ lib.optionals enableDocumentation [
# documentation
hotdoc hotdoc
]; ];
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
(lib.mesonEnable "doc" enableDocumentation)
]; ];
postPatch = '' postPatch = ''

View file

@ -4,7 +4,6 @@
, ninja , ninja
, pkg-config , pkg-config
, python3 , python3
, hotdoc
, gst-plugins-base , gst-plugins-base
, orc , orc
, gettext , gettext
@ -21,6 +20,8 @@
, CoreFoundation , CoreFoundation
, DiskArbitration , DiskArbitration
, enableGplPlugins ? true , enableGplPlugins ? true
# Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -40,8 +41,7 @@ stdenv.mkDerivation rec {
gettext gettext
pkg-config pkg-config
python3 python3
] ++ lib.optionals enableDocumentation [
# documentation
hotdoc hotdoc
]; ];
@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing
(lib.mesonEnable "doc" enableDocumentation)
] ++ (if enableGplPlugins then [ ] ++ (if enableGplPlugins then [
"-Dgpl=enabled" "-Dgpl=enabled"
] else [ ] else [

View file

@ -5,7 +5,6 @@
, pkg-config , pkg-config
, gst-plugins-base , gst-plugins-base
, bzip2 , bzip2
, hotdoc
, libva , libva
, wayland , wayland
, wayland-protocols , wayland-protocols
@ -19,6 +18,8 @@
, nasm , nasm
, libvpx , libvpx
, python3 , python3
# Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -42,8 +43,7 @@ stdenv.mkDerivation rec {
python3 python3
bzip2 bzip2
wayland wayland
] ++ lib.optionals enableDocumentation [
# documentation
hotdoc hotdoc
]; ];
@ -72,6 +72,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
(lib.mesonEnable "doc" enableDocumentation)
]; ];
postPatch = '' postPatch = ''