Merge pull request #132262 from smancill/libcanberra-darwin
libcanberra/libcanberra-gtk2: fix build on darwin
This commit is contained in:
commit
2d74656a15
|
@ -1,22 +1,25 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, pkg-config, libtool
|
||||
, gtk ? null
|
||||
, gtk2-x11, gtk3-x11 , gtkSupport ? null
|
||||
, libpulseaudio, gst_all_1, libvorbis, libcap
|
||||
, CoreServices
|
||||
, Carbon, CoreServices
|
||||
, withAlsa ? stdenv.isLinux, alsa-lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcanberra-0.30";
|
||||
pname = "libcanberra";
|
||||
version = "0.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.xz";
|
||||
url = "http://0pointer.de/lennart/projects/libcanberra/${pname}-${version}.tar.xz";
|
||||
sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config libtool ];
|
||||
buildInputs = [
|
||||
libpulseaudio libvorbis gtk
|
||||
libpulseaudio libvorbis
|
||||
] ++ (with gst_all_1; [ gstreamer gst-plugins-base ])
|
||||
++ lib.optional stdenv.isDarwin CoreServices
|
||||
++ lib.optional (gtkSupport == "gtk2") gtk2-x11
|
||||
++ lib.optional (gtkSupport == "gtk3") gtk3-x11
|
||||
++ lib.optionals stdenv.isDarwin [Carbon CoreServices]
|
||||
++ lib.optional stdenv.isLinux libcap
|
||||
++ lib.optional withAlsa alsa-lib;
|
||||
|
||||
|
@ -30,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
postPatch = (lib.optional stdenv.isDarwin) ''
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
patch -p0 < ${fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/macports/macports-ports/master/audio/libcanberra/files/patch-configure.diff";
|
||||
sha256 = "1f7h7ifpqvbfhqygn1b7klvwi80zmpv3538vbmq7ql7bkf1q8h31";
|
||||
|
@ -43,8 +46,8 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
gtkModule = "/lib/gtk-2.0/";
|
||||
passthru = lib.optionalAttrs (gtkSupport != null) {
|
||||
gtkModule = if gtkSupport == "gtk2" then "/lib/gtk-2.0" else "/lib/gtk-3.0/";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -62,6 +65,6 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.unix;
|
||||
# canberra-gtk-module.c:28:10: fatal error: 'gdk/gdkx.h' file not found
|
||||
# #include <gdk/gdkx.h>
|
||||
broken = stdenv.isDarwin;
|
||||
broken = stdenv.isDarwin && (gtkSupport == "gtk3");
|
||||
};
|
||||
}
|
||||
|
|
|
@ -16295,13 +16295,13 @@ in
|
|||
libcacard = callPackage ../development/libraries/libcacard { };
|
||||
|
||||
libcanberra = callPackage ../development/libraries/libcanberra {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon CoreServices;
|
||||
};
|
||||
libcanberra-gtk2 = pkgs.libcanberra.override {
|
||||
gtk = gtk2-x11;
|
||||
gtkSupport = "gtk2";
|
||||
};
|
||||
libcanberra-gtk3 = pkgs.libcanberra.override {
|
||||
gtk = gtk3-x11;
|
||||
gtkSupport = "gtk3";
|
||||
};
|
||||
|
||||
libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)
|
||||
|
|
Loading…
Reference in a new issue