diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-25 17:37:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 17:37:19 -0400 |
| commit | 11497a81a31eadce8ac030895e8d3c1abbfeb529 (patch) | |
| tree | cfce357be760a18500fd4fecc1613ff81a47a721 | |
| parent | 7e36240337e66b979f42663d282660d8a27f03fa (diff) | |
| parent | ee49498004c133b09dc08843b250a8038a6981f2 (diff) | |
| download | nixpkgs-11497a81a31eadce8ac030895e8d3c1abbfeb529.tar nixpkgs-11497a81a31eadce8ac030895e8d3c1abbfeb529.tar.gz nixpkgs-11497a81a31eadce8ac030895e8d3c1abbfeb529.tar.bz2 nixpkgs-11497a81a31eadce8ac030895e8d3c1abbfeb529.tar.lz nixpkgs-11497a81a31eadce8ac030895e8d3c1abbfeb529.tar.xz nixpkgs-11497a81a31eadce8ac030895e8d3c1abbfeb529.tar.zst nixpkgs-11497a81a31eadce8ac030895e8d3c1abbfeb529.zip | |
Merge pull request #69111 from rvolosatovs/fix/libcanberra-gtk
Fix libcanberra-gtk{2,3} on Darwin| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2f520079cd..9aabb3a0b8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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) |