lol

libcanberra: fix build on darwin

+14 -10
+13 -9
pkgs/development/libraries/libcanberra/default.nix
··· 1 1 { stdenv, lib, fetchurl, fetchpatch, pkg-config, libtool 2 2 , gtk2-x11, gtk3-x11 , gtkSupport ? null 3 3 , libpulseaudio, gst_all_1, libvorbis, libcap 4 - , Carbon, CoreServices 4 + , Carbon, CoreServices, AppKit 5 5 , withAlsa ? stdenv.isLinux, alsa-lib }: 6 6 7 7 stdenv.mkDerivation rec { ··· 21 21 ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]) 22 22 ++ lib.optional (gtkSupport == "gtk2") gtk2-x11 23 23 ++ lib.optional (gtkSupport == "gtk3") gtk3-x11 24 - ++ lib.optionals stdenv.isDarwin [Carbon CoreServices] 24 + ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices AppKit ] 25 25 ++ lib.optional stdenv.isLinux libcap 26 26 ++ lib.optional withAlsa alsa-lib; 27 27 ··· 33 33 url = "http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310"; 34 34 sha256 = "0rc7zwn39yxzxp37qh329g7375r5ywcqcaak8ryd0dgvg8m5hcx9"; 35 35 }) 36 + ] ++ lib.optionals stdenv.isDarwin [ 37 + (fetchpatch { 38 + url = "https://github.com/macports/macports-ports/raw/5a7965dfea7727d1ceedee46c7b0ccee9cb23468/audio/libcanberra/files/patch-configure.diff"; 39 + sha256 = "sha256-pEJy1krciUEg5BFIS8FJ4BubjfS/nt9aqi6BLnS1+4M="; 40 + extraPrefix = ""; 41 + }) 42 + (fetchpatch { 43 + url = "https://github.com/macports/macports-ports/raw/5a7965dfea7727d1ceedee46c7b0ccee9cb23468/audio/libcanberra/files/dynamic_lookup-11.patch"; 44 + sha256 = "sha256-nUjha2pKh5VZl0ZZzcr9NTo1TVuMqF4OcLiztxW+ofQ="; 45 + extraPrefix = ""; 46 + }) 36 47 ]; 37 - 38 - postPatch = lib.optionalString stdenv.isDarwin '' 39 - patch -p0 < ${fetchpatch { 40 - url = "https://raw.githubusercontent.com/macports/macports-ports/master/audio/libcanberra/files/patch-configure.diff"; 41 - sha256 = "1f7h7ifpqvbfhqygn1b7klvwi80zmpv3538vbmq7ql7bkf1q8h31"; 42 - }} 43 - ''; 44 48 45 49 postInstall = '' 46 50 for f in $out/lib/*.la; do
+1 -1
pkgs/top-level/all-packages.nix
··· 18729 18729 libcamera = callPackage ../development/libraries/libcamera { }; 18730 18730 18731 18731 libcanberra = callPackage ../development/libraries/libcanberra { 18732 - inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; 18732 + inherit (darwin.apple_sdk.frameworks) Carbon CoreServices AppKit; 18733 18733 }; 18734 18734 libcanberra-gtk2 = pkgs.libcanberra.override { 18735 18735 gtkSupport = "gtk2";