Unverified Commit dccbe1a9 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #129019 from Mindavi/gstreamer/cross-staging 

gstreamer: support cross by disabling introspection
parents fd4afd6d dc98b9aa

pkgs/development/libraries/gstreamer/bad/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -292,6 +292,8 @@ stdenv.mkDerivation rec { 
    # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,

    # but its meson build system does not declare the dependency.

    "-Dapplemedia=disabled"

  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

    "-Dintrospection=disabled"

  ];



  # Argument list too long

pkgs/development/libraries/gstreamer/base/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ stdenv.mkDerivation rec { 
    "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing

    # 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")}"

  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

    "-Dintrospection=disabled"

  ]

  ++ lib.optional (!enableX11) "-Dx11=disabled"

  # TODO How to disable Wayland?

pkgs/development/libraries/gstreamer/core/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ stdenv.mkDerivation rec { 
    "-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

    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing

  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

    "-Dintrospection=disabled"

  ] ++ lib.optionals stdenv.isDarwin [

    # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it.

    "-Dlibunwind=disabled"

pkgs/development/libraries/gstreamer/devtools/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ stdenv.mkDerivation rec { 


  mesonFlags = [

    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing

  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

    "-Dintrospection=disabled"

  ];



  meta = with lib; {

pkgs/development/libraries/gstreamer/ges/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ stdenv.mkDerivation rec { 


  mesonFlags = [

    "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing

  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

    "-Dintrospection=disabled"

  ];



  postPatch = ''