From ce17e9941f0cc762193b7c40ba07addb59a6546f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 22 Jun 2019 01:04:05 +0200 Subject: [PATCH] gst_all_1.gstreamer: re-enable auto_features --- pkgs/development/libraries/gstreamer/core/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index bf5d359745ac..fa838d5ff773 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -42,20 +42,20 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_412 ]; - buildInputs = [ libunwind ] - ++ lib.optionals stdenv.isLinux [ libcap elfutils ] + buildInputs = + lib.optionals stdenv.isLinux [ libcap libunwind 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"; + ++ stdenv.lib.optionals stdenv.isDarwin [ "-Dlibunwind=disabled" "-Dlibdw=disabled" ]; postInstall = '' for prog in "$dev/bin/"*; do