public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kde4: unify used libcanberra

Browse Source 
I wondered why I'm getting two versions in the closure of KDE apps.
This commit is contained in:
Vladimír Čunát 2013-07-05 14:22:01 +02:00
parent f064ee612f
commit 6f5e5cfe06
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/desktops/kde-4.10/kde-runtime.nix
View File

@ -3,19 +3,10 @@
, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, config , 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 { kde {
buildInputs = [ buildInputs = [
kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
qca2 samba canberra pulseaudio qca2 samba libcanberra pulseaudio
networkmanager kactivities kdepimlibs openexr networkmanager kactivities kdepimlibs openexr
#todo: add openslp #todo: add openslp
]; ];

2
pkgs/desktops/kde-4.7/kde-runtime.nix
View File

@ -5,7 +5,7 @@
kde { kde {
buildInputs = buildInputs =
[ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica
samba (libcanberra.override { gtk = null; }) ntrack libjpeg samba libcanberra ntrack libjpeg
]; ];
passthru.propagatedUserEnvPackages = [ virtuoso ]; passthru.propagatedUserEnvPackages = [ virtuoso ];

2
pkgs/desktops/kde-4.8/kde-runtime.nix
View File

@ -6,7 +6,7 @@
kde { kde {
buildInputs = buildInputs =
[ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica xz networkmanager [ 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 ]; nativeBuildInputs = [ pkgconfig ];

6
pkgs/top-level/all-packages.nix
View File

@ -4410,6 +4410,9 @@ let
libcaca = callPackage ../development/libraries/libcaca { }; libcaca = callPackage ../development/libraries/libcaca { };
libcanberra = callPackage ../development/libraries/libcanberra { }; 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 {}; libcello = callPackage ../development/libraries/libcello {};
@ -9038,6 +9041,7 @@ let
eigen = eigen2; eigen = eigen2;
libotr = libotr_3_2; libotr = libotr_3_2;
libgphoto2 = libgphoto2_4; libgphoto2 = libgphoto2_4;
libcanberra = libcanberra_kde;
}) ../desktops/kde-4.7; }) ../desktops/kde-4.7;
kde48 = kdePackagesFor (pkgs.kde48 // { kde48 = kdePackagesFor (pkgs.kde48 // {
@ -9045,6 +9049,7 @@ let
eigen = eigen2; eigen = eigen2;
libotr = libotr_3_2; libotr = libotr_3_2;
libgphoto2 = libgphoto2_4; libgphoto2 = libgphoto2_4;
libcanberra = libcanberra_kde;
}) ../desktops/kde-4.8; }) ../desktops/kde-4.8;
kde410 = kdePackagesFor (pkgs.kde410 // { kde410 = kdePackagesFor (pkgs.kde410 // {
@ -9053,6 +9058,7 @@ let
libotr = libotr_3_2; libotr = libotr_3_2;
libusb = libusb1; libusb = libusb1;
ffmpeg = ffmpeg_1; ffmpeg = ffmpeg_1;
libcanberra = libcanberra_kde;
}) ../desktops/kde-4.10; }) ../desktops/kde-4.10;
kdePackagesFor = self: dir: kdePackagesFor = self: dir: