diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-07-05 14:22:01 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-07-05 14:45:44 +0200 |
| commit | 6f5e5cfe06d57db31c815b8b3c9d80be07dd2b9d (patch) | |
| tree | 9a647d0d3287e7cee7b101d8020199dbc02a3b0b | |
| parent | f064ee612fd9f6d9763e4198708c8f859514aa30 (diff) | |
| download | nixlib-6f5e5cfe06d57db31c815b8b3c9d80be07dd2b9d.tar nixlib-6f5e5cfe06d57db31c815b8b3c9d80be07dd2b9d.tar.gz nixlib-6f5e5cfe06d57db31c815b8b3c9d80be07dd2b9d.tar.bz2 nixlib-6f5e5cfe06d57db31c815b8b3c9d80be07dd2b9d.tar.lz nixlib-6f5e5cfe06d57db31c815b8b3c9d80be07dd2b9d.tar.xz nixlib-6f5e5cfe06d57db31c815b8b3c9d80be07dd2b9d.tar.zst nixlib-6f5e5cfe06d57db31c815b8b3c9d80be07dd2b9d.zip | |
kde4: unify used libcanberra
I wondered why I'm getting two versions in the closure of KDE apps.
| -rw-r--r-- | pkgs/desktops/kde-4.10/kde-runtime.nix | 11 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.7/kde-runtime.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.8/kde-runtime.nix | 2 | ||||
| -rw-r--r-- | 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 2282ee57c2c2..a2fef65d75c0 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 9b25e77b0835..b82ec2f66783 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 f8246190462d..b8f9afff7b3d 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 00428a2ad7b8..44df80361af7 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: |