swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #63637: gst_all_1.gstreamer: re-enable auto_features

Browse source 
In particular this fixes build of gst_all_1.gst-plugins-base
This commit is contained in:
Vladimír Čunát 2019-06-22 09:41:09 +02:00
parent 2873952068 ce17e9941f
commit 426028047d
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/gstreamer/core/default.nix
View file

@ -42,20 +42,20 @@ stdenv.mkDerivation rec {
docbook_xsl docbook_xml_dtd_412 docbook_xsl docbook_xml_dtd_412
]; ];
buildInputs = [ libunwind ] buildInputs =
++ lib.optionals stdenv.isLinux [ libcap elfutils ] lib.optionals stdenv.isLinux [ libcap libunwind elfutils ]
++ lib.optional stdenv.isDarwin CoreServices; ++ lib.optional stdenv.isDarwin CoreServices;
propagatedBuildInputs = [ glib ]; propagatedBuildInputs = [ glib ];
mesonFlags = [ mesonFlags = [
# Enables all features, so that we know when new dependencies are necessary. # 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 "-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 "-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. # 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 = '' postInstall = ''
for prog in "$dev/bin/"*; do for prog in "$dev/bin/"*; do