kde4: unify used libcanberra
I wondered why I'm getting two versions in the closure of KDE apps.
This commit is contained in:
parent
f064ee612f
commit
6f5e5cfe06
|
@ -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
|
||||
];
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue