libcanberra: fix darwin build (#47634) · tjh.dev/nixpkgs@aeee761

tjh.dev / nixpkgs

fork atom

Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

fork atom

libcanberra: fix darwin build (#47634)

authored by

Josef Kemetmüller and committed by

xeji 7 years ago aeee761a 9ac78930

+5 -1

2 changed files

expand all

unified split

pkgs

development

libraries

libcanberra

default.nix

top-level

all-packages.nix

pkgs/development/libraries/libcanberra/default.nix

··· 1 { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool 2 , gtk ? null 3 , libpulseaudio, gst_all_1, libvorbis, libcap 4 , withAlsa ? stdenv.isLinux, alsaLib }: 5 6 stdenv.mkDerivation rec { ··· 15 buildInputs = [ 16 libpulseaudio libvorbis gtk 17 ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) 18 ++ lib.optional stdenv.isLinux libcap 19 ++ lib.optional withAlsa alsaLib; 20

··· 1 { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool 2 , gtk ? null 3 , libpulseaudio, gst_all_1, libvorbis, libcap 4 + , CoreServices 5 , withAlsa ? stdenv.isLinux, alsaLib }: 6 7 stdenv.mkDerivation rec { ··· 16 buildInputs = [ 17 libpulseaudio libvorbis gtk 18 ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) 19 + ++ lib.optional stdenv.isDarwin CoreServices 20 ++ lib.optional stdenv.isLinux libcap 21 ++ lib.optional withAlsa alsaLib; 22

+3 -1

pkgs/top-level/all-packages.nix

··· 10254 inherit (xorg) libX11 libXext; 10255 }; 10256 10257 - libcanberra = callPackage ../development/libraries/libcanberra { }; 10258 libcanberra-gtk3 = pkgs.libcanberra.override { 10259 gtk = gtk3; 10260 };

··· 10254 inherit (xorg) libX11 libXext; 10255 }; 10256 10257 + libcanberra = callPackage ../development/libraries/libcanberra { 10258 + inherit (darwin.apple_sdk.frameworks) CoreServices; 10259 + }; 10260 libcanberra-gtk3 = pkgs.libcanberra.override { 10261 gtk = gtk3; 10262 };