From aeee761abaf1cb44fa73156ceea7a4e9598a1b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Tue, 2 Oct 2018 12:55:57 +0200 Subject: [PATCH] libcanberra: fix darwin build (#47634) --- pkgs/development/libraries/libcanberra/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 8addb6128f0..460a58a19a7 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool , gtk ? null , libpulseaudio, gst_all_1, libvorbis, libcap +, CoreServices , withAlsa ? stdenv.isLinux, alsaLib }: stdenv.mkDerivation rec { @@ -15,6 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpulseaudio libvorbis gtk ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) + ++ lib.optional stdenv.isDarwin CoreServices ++ lib.optional stdenv.isLinux libcap ++ lib.optional withAlsa alsaLib; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcaf137045e..b152a2e019f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10254,7 +10254,9 @@ with pkgs; inherit (xorg) libX11 libXext; }; - libcanberra = callPackage ../development/libraries/libcanberra { }; + libcanberra = callPackage ../development/libraries/libcanberra { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; libcanberra-gtk3 = pkgs.libcanberra.override { gtk = gtk3; };