From cb061ef4f2faf05e226e72da323c5d3c310c25bb Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 10 Jan 2017 23:15:05 +0100 Subject: [PATCH] gst_plugins_base: add darwin frameworks --- .../libraries/gstreamer/legacy/gst-plugins-base/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 0e1e3c4897e..5b2ba728f3a 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,6 +1,7 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libintlOrEmpty +, ApplicationServices , # Whether to build no plugins that have external dependencies # (except the ALSA plugin). minimalDeps ? false @@ -36,7 +37,8 @@ stdenv.mkDerivation rec { liboil ] # can't build cdparanoia on darwin ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia - ++ libintlOrEmpty; + ++ libintlOrEmpty + ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fb528c6465..15796fd0356 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7386,7 +7386,9 @@ in bison = bison2; }; - gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {}; + gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; gst_plugins_good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {};