From 6f5e5cfe06d57db31c815b8b3c9d80be07dd2b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 5 Jul 2013 14:22:01 +0200
Subject: [PATCH] kde4: unify used libcanberra

I wondered why I'm getting two versions in the closure of KDE apps.
---
 pkgs/desktops/kde-4.10/kde-runtime.nix | 11 +----------
 pkgs/desktops/kde-4.7/kde-runtime.nix  |  2 +-
 pkgs/desktops/kde-4.8/kde-runtime.nix  |  2 +-
 pkgs/top-level/all-packages.nix        |  6 ++++++
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix
index 2282ee57c2c..a2fef65d75c 100644
--- a/pkgs/desktops/kde-4.10/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.10/kde-runtime.nix
@@ -3,19 +3,10 @@
 , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, config
 }:
 
-let libcanberraWithoutGTK = if (config ? kde_runtime && config.kde_runtime ? libcanberraWithoutGTK)
-                            then config.kde_runtime.libcanberraWithoutGTK
-                            else true;
-
-    canberra = if libcanberraWithoutGTK
-               then libcanberra.override { gtk = null; }
-               else libcanberra;
-in
-
 kde {
   buildInputs = [
     kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
-    qca2 samba canberra pulseaudio
+    qca2 samba libcanberra pulseaudio
     networkmanager kactivities kdepimlibs openexr
 #todo: add openslp
   ];
diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix
index 9b25e77b083..b82ec2f6678 100644
--- a/pkgs/desktops/kde-4.7/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.7/kde-runtime.nix
@@ -5,7 +5,7 @@
 kde {
   buildInputs =
     [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica
-      samba (libcanberra.override { gtk = null; }) ntrack libjpeg
+      samba libcanberra ntrack libjpeg
     ];
 
   passthru.propagatedUserEnvPackages = [ virtuoso ];
diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix
index f8246190462..b8f9afff7b3 100644
--- a/pkgs/desktops/kde-4.8/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.8/kde-runtime.nix
@@ -6,7 +6,7 @@
 kde {
   buildInputs =
     [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica xz networkmanager
-      samba (libcanberra.override { gtk = null; }) ntrack libjpeg qca2 pulseaudio
+      samba libcanberra ntrack libjpeg qca2 pulseaudio
     ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00428a2ad7b..44df80361af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4410,6 +4410,9 @@ let
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra = callPackage ../development/libraries/libcanberra { };
+  libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true)
+    then libcanberra.override { gtk = null; }
+    else libcanberra;
 
   libcello = callPackage ../development/libraries/libcello {};
 
@@ -9038,6 +9041,7 @@ let
       eigen = eigen2;
       libotr = libotr_3_2;
       libgphoto2 = libgphoto2_4;
+      libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.7;
 
   kde48 = kdePackagesFor (pkgs.kde48 // {
@@ -9045,6 +9049,7 @@ let
       eigen = eigen2;
       libotr = libotr_3_2;
       libgphoto2 = libgphoto2_4;
+      libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.8;
 
   kde410 = kdePackagesFor (pkgs.kde410 // {
@@ -9053,6 +9058,7 @@ let
       libotr = libotr_3_2;
       libusb = libusb1;
       ffmpeg = ffmpeg_1;
+      libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.10;
 
   kdePackagesFor = self: dir: