diff options
| author | Josef Kemetmüller <josef.kemetmueller@aon.at> | 2018-10-02 12:55:57 +0200 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-10-02 12:55:57 +0200 |
| commit | aeee761abaf1cb44fa73156ceea7a4e9598a1b17 (patch) | |
| tree | d06190a3dd13db25c5d73acbdb9733125654e60e /pkgs | |
| parent | 9ac78930426b5d2d2538d838534c574212e81d78 (diff) | |
| download | nixlib-aeee761abaf1cb44fa73156ceea7a4e9598a1b17.tar nixlib-aeee761abaf1cb44fa73156ceea7a4e9598a1b17.tar.gz nixlib-aeee761abaf1cb44fa73156ceea7a4e9598a1b17.tar.bz2 nixlib-aeee761abaf1cb44fa73156ceea7a4e9598a1b17.tar.lz nixlib-aeee761abaf1cb44fa73156ceea7a4e9598a1b17.tar.xz nixlib-aeee761abaf1cb44fa73156ceea7a4e9598a1b17.tar.zst nixlib-aeee761abaf1cb44fa73156ceea7a4e9598a1b17.zip | |
libcanberra: fix darwin build (#47634)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libcanberra/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 8addb6128f0c..460a58a19a70 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 bcaf137045e3..b152a2e019ff 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; }; |