diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2019-06-22 01:04:05 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2019-06-22 01:12:20 +0200 |
commit | ce17e9941f0cc762193b7c40ba07addb59a6546f (patch) | |
tree | aee3a204dcbe48ffecc537512bdf28dd205cc7bb | |
parent | 9983820e9302d0899c6ce6224d2afa4e0854ca28 (diff) | |
download | nixpkgs-ce17e9941f0cc762193b7c40ba07addb59a6546f.tar nixpkgs-ce17e9941f0cc762193b7c40ba07addb59a6546f.tar.gz nixpkgs-ce17e9941f0cc762193b7c40ba07addb59a6546f.tar.bz2 nixpkgs-ce17e9941f0cc762193b7c40ba07addb59a6546f.tar.lz nixpkgs-ce17e9941f0cc762193b7c40ba07addb59a6546f.tar.xz nixpkgs-ce17e9941f0cc762193b7c40ba07addb59a6546f.tar.zst nixpkgs-ce17e9941f0cc762193b7c40ba07addb59a6546f.zip |
gst_all_1.gstreamer: re-enable auto_features
-rw-r--r-- | pkgs/development/libraries/gstreamer/core/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index bf5d359745a..fa838d5ff77 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 |