public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libcanberra: fix darwin build (#47634)

Browse Source
This commit is contained in:
Josef Kemetmüller 2018-10-02 12:55:57 +02:00 committed by xeji
parent 9ac7893042
commit aeee761aba
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libcanberra/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool
, gtk ? null , gtk ? null
, libpulseaudio, gst_all_1, libvorbis, libcap , libpulseaudio, gst_all_1, libvorbis, libcap
, CoreServices
, withAlsa ? stdenv.isLinux, alsaLib }: , withAlsa ? stdenv.isLinux, alsaLib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,6 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libpulseaudio libvorbis gtk libpulseaudio libvorbis gtk
] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional stdenv.isDarwin CoreServices
++ lib.optional stdenv.isLinux libcap ++ lib.optional stdenv.isLinux libcap
++ lib.optional withAlsa alsaLib; ++ lib.optional withAlsa alsaLib;

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

@ -10254,7 +10254,9 @@ with pkgs;
inherit (xorg) libX11 libXext; 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 { libcanberra-gtk3 = pkgs.libcanberra.override {
gtk = gtk3; gtk = gtk3;
}; };