Author: urkud
Date: Fri Aug 19 15:42:58 2011
New Revision: 28694
URL: https://svn.nixos.org/websvn/nix/?rev=28694&sc=1
Log:
Pass individual packages in kde-4.7
E.g., use
{ ..., marble, ... } : marble
instead of
{ ..., kdeedu, ... } : kdeedu.marble
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/perlqt.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/smokekde.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdegames.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix Fri Aug
19 15:37:12 2011 (r28693)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix Fri Aug
19 15:42:58 2011 (r28694)
@@ -1,13 +1,13 @@
{ 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,
- kdebindings
+ pykde4
}:
kde {
buildInputs =
- [ kdelibs qimageblitz libdbusmenu_qt kdebindings.pykde4
+ [ kdelibs qimageblitz libdbusmenu_qt pykde4
xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/perlqt.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/perlqt.nix Fri Aug 19
15:37:12 2011 (r28693)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/perlqt.nix Fri Aug 19
15:42:58 2011 (r28694)
@@ -1,7 +1,7 @@
-{ kde, cmake, kdebindings, perl }:
+{ kde, cmake, smokeqt, perl }:
kde {
- buildInputs = [ kdebindings.smokeqt perl ];
+ buildInputs = [ smokeqt perl ];
buildNativeInputs = [ cmake ];
meta = {
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/smokekde.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/smokekde.nix Fri Aug
19 15:37:12 2011 (r28693)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/smokekde.nix Fri Aug
19 15:42:58 2011 (r28694)
@@ -1,7 +1,7 @@
-{ kde, kdelibs, kdebindings }:
+{ kde, kdelibs, smokeqt }:
kde {
- propagatedBuildInputs = [ kdelibs kdebindings.smokeqt ];
+ propagatedBuildInputs = [ kdelibs smokeqt ];
meta = {
description = "C++ parser used to generate language bindings for Qt/KDE";
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix Fri Aug 19
15:37:12 2011 (r28693)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix Fri Aug 19
15:42:58 2011 (r28694)
@@ -1,9 +1,9 @@
-{ kde, qt4, cmake, phonon, qimageblitz, kdebindings }:
+{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
kde {
propagatedBuildInputs = [ qt4 phonon qimageblitz ];
buildNativeInputs = [ cmake ];
- propagatedBuildNativeInputs = [ kdebindings.smokegen ];
+ propagatedBuildNativeInputs = [ smokegen ];
meta = {
description = "C++ parser used to generate language bindings for Qt/KDE";
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdegames.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdegames.nix Fri Aug 19 15:37:12
2011 (r28693)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdegames.nix Fri Aug 19 15:42:58
2011 (r28694)
@@ -1,11 +1,11 @@
-{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, kdebindings,
+{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4,
openal, libsndfile, qhull }:
kde rec {
buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython
openal libsndfile qhull ] ++ pythonPath;
- pythonPath = [ pythonPackages.twisted kdebindings.pykde4 ];
+ pythonPath = [ pythonPackages.twisted pykde4 ];
# TODO: ggz
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix Fri Aug
19 15:37:12 2011 (r28693)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix Fri Aug
19 15:42:58 2011 (r28694)
@@ -1,7 +1,7 @@
-{ kde, kdelibs, kdegraphics }:
+{ kde, kdelibs, okular }:
kde {
- buildInputs = [ kdelibs kdegraphics.okular ];
+ buildInputs = [ kdelibs okular ];
meta = {
description = "A collection of plugins to handle mobipocket files";
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kdeplasma-addons.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kdeplasma-addons.nix Fri Aug 19
15:37:12 2011 (r28693)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kdeplasma-addons.nix Fri Aug 19
15:42:58 2011 (r28694)
@@ -1,16 +1,15 @@
-{ kde, kdelibs, kdeedu, shared_desktop_ontologies
+{ kde, kdelibs, marble, shared_desktop_ontologies
, boost, eigen, kde_workspace, attica, python, qca2, qimageblitz
, kdepimlibs, libkexiv2, libqalculate, libXtst }:
# TODO: qwt, scim
-# TODO: parts of kdegraphics, kdeedu
kde {
- KDEDIRS=kdeedu.marble;
+ KDEDIRS=marble;
buildInputs = [ kdelibs boost eigen kde_workspace
attica python qca2 qimageblitz kdepimlibs
- libqalculate libXtst shared_desktop_ontologies kdeedu.marble libkexiv2];
+ libqalculate libXtst shared_desktop_ontologies marble libkexiv2];
meta = {
description = "KDE Plasma Addons";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
