diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 9869e1eddbd..bf5d359745a 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -7,6 +7,7 @@ , docbook_xsl, docbook_xml_dtd_412 , gtk-doc , lib +, CoreServices }: stdenv.mkDerivation rec { @@ -41,18 +42,20 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_412 ]; - buildInputs = - lib.optionals stdenv.isLinux [ libcap libunwind elfutils ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices; + buildInputs = [ libunwind ] + ++ lib.optionals stdenv.isLinux [ libcap elfutils ] + ++ lib.optional stdenv.isDarwin CoreServices; propagatedBuildInputs = [ glib ]; mesonFlags = [ # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" + # "-Dauto_features=enabled" "-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 - ]; + ] + # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it. + ++ stdenv.lib.optional stdenv.isDarwin "-DHAVE_UNWIND=1"; postInstall = '' for prog in "$dev/bin/"*; do diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 767ef8c6afd..94d71760a7f 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,7 +1,7 @@ -{ callPackage }: +{ callPackage, CoreServices }: rec { - gstreamer = callPackage ./core { }; + gstreamer = callPackage ./core { inherit CoreServices; }; gstreamermm = callPackage ./gstreamermm { }; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index d03151e4344..c70e898a47d 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, stdenv, autoreconfHook -, perl, bison2, flex, pkgconfig, glib, libxml2, libintl +, perl, bison2, flex, pkgconfig, glib, libxml2, libintl, libunwind }: stdenv.mkDerivation rec { @@ -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; propagatedBuildInputs = [ glib libxml2 ]; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f99abb2315b..25fc335963e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }); gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { };