kde4: unify used libcanberra

I wondered why I'm getting two versions in the closure of KDE apps.

+9 -12
+1 -10
pkgs/desktops/kde-4.10/kde-runtime.nix
··· 3 3 , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, config 4 4 }: 5 5 6 - let libcanberraWithoutGTK = if (config ? kde_runtime && config.kde_runtime ? libcanberraWithoutGTK) 7 - then config.kde_runtime.libcanberraWithoutGTK 8 - else true; 9 - 10 - canberra = if libcanberraWithoutGTK 11 - then libcanberra.override { gtk = null; } 12 - else libcanberra; 13 - in 14 - 15 6 kde { 16 7 buildInputs = [ 17 8 kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack 18 - qca2 samba canberra pulseaudio 9 + qca2 samba libcanberra pulseaudio 19 10 networkmanager kactivities kdepimlibs openexr 20 11 #todo: add openslp 21 12 ];
+1 -1
pkgs/desktops/kde-4.7/kde-runtime.nix
··· 5 5 kde { 6 6 buildInputs = 7 7 [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica 8 - samba (libcanberra.override { gtk = null; }) ntrack libjpeg 8 + samba libcanberra ntrack libjpeg 9 9 ]; 10 10 11 11 passthru.propagatedUserEnvPackages = [ virtuoso ];
+1 -1
pkgs/desktops/kde-4.8/kde-runtime.nix
··· 6 6 kde { 7 7 buildInputs = 8 8 [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica xz networkmanager 9 - samba (libcanberra.override { gtk = null; }) ntrack libjpeg qca2 pulseaudio 9 + samba libcanberra ntrack libjpeg qca2 pulseaudio 10 10 ]; 11 11 12 12 nativeBuildInputs = [ pkgconfig ];
+6
pkgs/top-level/all-packages.nix
··· 4410 4410 libcaca = callPackage ../development/libraries/libcaca { }; 4411 4411 4412 4412 libcanberra = callPackage ../development/libraries/libcanberra { }; 4413 + libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) 4414 + then libcanberra.override { gtk = null; } 4415 + else libcanberra; 4413 4416 4414 4417 libcello = callPackage ../development/libraries/libcello {}; 4415 4418 ··· 9038 9041 eigen = eigen2; 9039 9042 libotr = libotr_3_2; 9040 9043 libgphoto2 = libgphoto2_4; 9044 + libcanberra = libcanberra_kde; 9041 9045 }) ../desktops/kde-4.7; 9042 9046 9043 9047 kde48 = kdePackagesFor (pkgs.kde48 // { ··· 9045 9049 eigen = eigen2; 9046 9050 libotr = libotr_3_2; 9047 9051 libgphoto2 = libgphoto2_4; 9052 + libcanberra = libcanberra_kde; 9048 9053 }) ../desktops/kde-4.8; 9049 9054 9050 9055 kde410 = kdePackagesFor (pkgs.kde410 // { ··· 9053 9058 libotr = libotr_3_2; 9054 9059 libusb = libusb1; 9055 9060 ffmpeg = ffmpeg_1; 9061 + libcanberra = libcanberra_kde; 9056 9062 }) ../desktops/kde-4.10; 9057 9063 9058 9064 kdePackagesFor = self: dir: