Merge pull request #69111 from rvolosatovs/fix/libcanberra-gtk

Fix libcanberra-gtk{2,3} on Darwin
This commit is contained in:
Matthew Bauer 2019-09-25 17:37:19 -04:00 committed by GitHub
commit 11497a81a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11641,11 +11641,11 @@ in
libcanberra = callPackage ../development/libraries/libcanberra {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
libcanberra-gtk3 = pkgs.libcanberra.override {
gtk = gtk3.override { x11Support = true; };
libcanberra-gtk2 = pkgs.libcanberra.override {
gtk = gtk2-x11;
};
libcanberra-gtk2 = pkgs.libcanberra-gtk3.override {
gtk = gtk2.override { gdktarget = "x11"; };
libcanberra-gtk3 = pkgs.libcanberra.override {
gtk = gtk3-x11;
};
libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)