nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-06 20:23:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

gstreamer: fix darwin build

Browse Source
This commit is contained in:
Daiderd Jordan 2019-06-21 20:01:33 +02:00
parent a9ea6fe5fb
commit 2962730b88
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -7,6 +7,7 @@
, docbook_xsl, docbook_xml_dtd_412 , docbook_xsl, docbook_xml_dtd_412
, gtk-doc , gtk-doc
, lib , lib
, CoreServices
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -41,18 +42,20 @@ stdenv.mkDerivation rec {
docbook_xsl docbook_xml_dtd_412 docbook_xsl docbook_xml_dtd_412
]; ];
buildInputs = buildInputs = [ libunwind ]
lib.optionals stdenv.isLinux [ libcap libunwind elfutils ] ++ lib.optionals stdenv.isLinux [ libcap elfutils ]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.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.
++ stdenv.lib.optional stdenv.isDarwin "-DHAVE_UNWIND=1";
postInstall = '' postInstall = ''
for prog in "$dev/bin/"*; do for prog in "$dev/bin/"*; do

4
pkgs/development/libraries/gstreamer/default.nix
View File

@ -1,7 +1,7 @@
{ callPackage }: { callPackage, CoreServices }:
rec { rec {
gstreamer = callPackage ./core { }; gstreamer = callPackage ./core { inherit CoreServices; };
gstreamermm = callPackage ./gstreamermm { }; gstreamermm = callPackage ./gstreamermm { };

3
pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, fetchpatch, stdenv, autoreconfHook { fetchurl, fetchpatch, stdenv, autoreconfHook
, perl, bison2, flex, pkgconfig, glib, libxml2, libintl , perl, bison2, flex, pkgconfig, glib, libxml2, libintl, libunwind
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison2 glib ]; nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison2 glib ];
buildInputs = stdenv.lib.optional stdenv.isDarwin libunwind;
propagatedBuildInputs = [ glib libxml2 ]; propagatedBuildInputs = [ glib libxml2 ];
patches = [ patches = [

1
pkgs/top-level/all-packages.nix
View File

@ -10671,6 +10671,7 @@ in
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
callPackage = newScope { libav = pkgs.ffmpeg_4; }; callPackage = newScope { libav = pkgs.ffmpeg_4; };
inherit (darwin.apple_sdk.frameworks) CoreServices;
}); });
gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { }; gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { };