gstreamer: fix darwin build #63627
gstreamer: fix darwin build #63627
Conversation
|
This breaks |
|
|
||
| propagatedBuildInputs = [ glib ]; | ||
|
|
||
| mesonFlags = [ | ||
| # Enables all features, so that we know when new dependencies are necessary. | ||
| "-Dauto_features=enabled" | ||
| # "-Dauto_features=enabled" |
There was a problem hiding this comment.
Could you disable just the feature you do not want on darwin?
There was a problem hiding this comment.
I'm not sure how, but my changes are all darwin only.
There was a problem hiding this comment.
Oh, whoops. I didn't mean to include that.
There was a problem hiding this comment.
Do you know if there's a way to disable the pkgconfig checks for a dependency? The other part didn't do anything.
There was a problem hiding this comment.
Other than patching it, I do not think so.
You can disable it by using
-Dunwind=disabled
but that will also remove unwind support on Darwin. If you want to support that, you can replace the following line
by
unwind_dep = cc.find_library('unwind', required : get_option('libunwind'))on Darwin.
| ]; | ||
| ] | ||
| # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it. | ||
| ++ stdenv.lib.optional stdenv.isDarwin "-DHAVE_UNWIND=1"; |
There was a problem hiding this comment.
Are you sure this does anything? I do not think meson supports passing compiler flags like this.
There was a problem hiding this comment.
Yeah, it only worked because of the accidental change above. The problem is that the apple libunwind sources don't contain pkgconfig definitions, I'm not very familiar with meson but we just need a way to to tell it to enable without checking.
| @@ -10671,6 +10671,7 @@ in | |||
|
|
|||
| gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { | |||
| callPackage = newScope { libav = pkgs.ffmpeg_4; }; | |||
| inherit (darwin.apple_sdk.frameworks) CoreServices; | |||
There was a problem hiding this comment.
Perhaps we should add that to the scope on previous line?
| @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { | |||
| outputs = [ "out" "dev" ]; | |||
|
|
|||
| nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison2 glib ]; | |||
| buildInputs = stdenv.lib.optional stdenv.isDarwin libunwind; | |||
There was a problem hiding this comment.
Is this intentional, or just a result of confusion of gst_all_1.gstreamer with gstreamer?
|
this broke my system (NixOS @ channels/nixos-unstable): |
Motivation for this change
Another fix to unblock
qt5.qtmultimedia#63617.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)