diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-22 23:23:53 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-22 23:23:53 +0100 |
| commit | 0a47a28f1df3bdf7b2cf074af84a432aa48cbba7 (patch) | |
| tree | 6c953c0d58cf6d178795383fefe9babddaa7da4e /pkgs/desktops | |
| parent | 3e2e62ca31311dd7e5237aa97a815458a44a3a3e (diff) | |
| parent | 296cd6600943d5a349cda55a36137331f8c3eec8 (diff) | |
| download | nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.gz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.bz2 nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.lz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.xz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.zst nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-4.7/kde-workspace.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.8/kde-workspace.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index cfc9986ecfab..827307029890 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -1,6 +1,6 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies , lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate -, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi +, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi , pykde4, libjpeg, pkgconfig, libXft, libXxf86misc }: @@ -12,7 +12,7 @@ kde { xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 - libusb python libqalculate consolekit kdepimlibs pam prison akonadi + libusb python libqalculate kdepimlibs pam prison akonadi ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.8/kde-workspace.nix b/pkgs/desktops/kde-4.8/kde-workspace.nix index 1f1466eeaec4..97192e55be37 100644 --- a/pkgs/desktops/kde-4.8/kde-workspace.nix +++ b/pkgs/desktops/kde-4.8/kde-workspace.nix @@ -1,6 +1,6 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, - consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, + xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities }: @@ -12,7 +12,7 @@ kde { xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 - libusb python libqalculate consolekit kdepimlibs pam prison akonadi + libusb python libqalculate kdepimlibs pam prison akonadi kactivities ]; |