diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 21:01:47 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 21:01:47 +0000 |
| commit | b7642bfdfbdfe3e0e6f8e07aaaa442220171926e (patch) | |
| tree | 14a69ee544e510f9084986880fb2787c8b7e8fe5 /pkgs/desktops | |
| parent | f99db3674858244a5dcedeccdc71b46821e30436 (diff) | |
| parent | 296eff8fbdab59d07d22d7bad0034995ab05e519 (diff) | |
| download | nixlib-b7642bfdfbdfe3e0e6f8e07aaaa442220171926e.tar nixlib-b7642bfdfbdfe3e0e6f8e07aaaa442220171926e.tar.gz nixlib-b7642bfdfbdfe3e0e6f8e07aaaa442220171926e.tar.bz2 nixlib-b7642bfdfbdfe3e0e6f8e07aaaa442220171926e.tar.lz nixlib-b7642bfdfbdfe3e0e6f8e07aaaa442220171926e.tar.xz nixlib-b7642bfdfbdfe3e0e6f8e07aaaa442220171926e.tar.zst nixlib-b7642bfdfbdfe3e0e6f8e07aaaa442220171926e.zip | |
svn merge ^/nixpkgs/trunk
I need the latest KDE-related changes svn path=/nixpkgs/branches/stdenv-updates/; revision=32806
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-4.7/kdeplasma-addons.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.8/kdeplasma-addons.nix | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix b/pkgs/desktops/kde-4.7/kdeplasma-addons.nix index de2cabf20e4f..ddffa48dc55b 100644 --- a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-4.7/kdeplasma-addons.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, marble, shared_desktop_ontologies +{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig , boost, eigen, kde_workspace, attica, python, qca2, qimageblitz , kdepimlibs, libkexiv2, libqalculate, libXtst }: # TODO: qwt, scim @@ -11,6 +11,8 @@ kde { attica python qca2 qimageblitz kdepimlibs libqalculate libXtst shared_desktop_ontologies marble libkexiv2]; + buildNativeInputs = [ pkgconfig ]; + meta = { description = "KDE Plasma Addons"; license = "GPL"; diff --git a/pkgs/desktops/kde-4.8/kdeplasma-addons.nix b/pkgs/desktops/kde-4.8/kdeplasma-addons.nix index de2cabf20e4f..9d70579d6d24 100644 --- a/pkgs/desktops/kde-4.8/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-4.8/kdeplasma-addons.nix @@ -1,6 +1,6 @@ -{ kde, kdelibs, marble, shared_desktop_ontologies +{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig , boost, eigen, kde_workspace, attica, python, qca2, qimageblitz -, kdepimlibs, libkexiv2, libqalculate, libXtst }: +, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt }: # TODO: qwt, scim kde { @@ -8,9 +8,11 @@ kde { KDEDIRS=marble; buildInputs = [ kdelibs boost eigen kde_workspace - attica python qca2 qimageblitz kdepimlibs + attica python qca2 qimageblitz kdepimlibs libdbusmenu_qt libqalculate libXtst shared_desktop_ontologies marble libkexiv2]; + buildNativeInputs = [ pkgconfig ]; + meta = { description = "KDE Plasma Addons"; license = "GPL"; |