Author: kkallio
Date: Sun Aug 7 00:37:14 2011
New Revision: 28210
URL: https://svn.nixos.org/websvn/nix/?rev=28210&sc=1
Log:
Set up kdegraphics section in kde 4.7
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/gwenview.nix
- copied, changed from r28197,
nixpkgs/trunk/pkgs/desktops/kde-4.7/gwenview.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/kamera.nix
- copied, changed from r28197,
nixpkgs/trunk/pkgs/desktops/kde-4.7/kamera.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/kgamma.nix
- copied, changed from r28197,
nixpkgs/trunk/pkgs/desktops/kde-4.7/kgamma.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/kolourpaint.nix
- copied, changed from r28197,
nixpkgs/trunk/pkgs/desktops/kde-4.7/kolourpaint.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/ksnapshot.nix
- copied, changed from r28197,
nixpkgs/trunk/pkgs/desktops/kde-4.7/ksnapshot.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/okular.nix
- copied, changed from r28197,
nixpkgs/trunk/pkgs/desktops/kde-4.7/okular.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kruler.nix
Deleted:
nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/gwenview.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kamera.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kgamma.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/kolourpaint.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/ksnapshot.nix
nixpkgs/trunk/pkgs/desktops/kde-4.7/okular.nix
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Sat Aug 6 23:26:38
2011 (r28209)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/default.nix Sun Aug 7 00:37:14
2011 (r28210)
@@ -67,20 +67,12 @@
### OTHER MODULES
- gwenview = callPackage ./gwenview.nix { };
-
- okular = callPackage ./okular.nix { };
-
konsole = callPackage ./konsole.nix { };
kcolorchooser = callPackage ./kcolorchooser.nix { };
kate = callPackage ./kate.nix { };
- ksnapshot = callPackage ./ksnapshot.nix { };
-
- kamera = callPackage ./kamera.nix { };
-
kde_wallpapers = callPackage ./wallpapers.nix { };
kdeadmin = callPackage ./admin.nix { };
@@ -89,10 +81,6 @@
kdemultimedia = callPackage ./multimedia.nix { };
- kolourpaint = callPackage ./kolourpaint.nix { };
-
- kgamma = callPackage ./kgamma.nix { };
-
kdeaccessibility = combinePkgs "kdeaccessibility" {
#jovie = callPackage ./accessibility/jovie.nix { };
kmag = callPackage ./accessibility/kmag.nix { };
@@ -122,7 +110,17 @@
kdenetwork = callPackage ./network { };
kdeplasma_addons = callPackage ./plasma-addons { };
*/
-
+
+ kdegraphics = combinePkgs "kdegraphics" {
+ gwenview = callPackage ./graphics/gwenview.nix { };
+ kamera = callPackage ./graphics/kamera.nix { };
+ kgamma = callPackage ./graphics/kgamma.nix { };
+ kolourpaint = callPackage ./graphics/kolourpaint.nix { };
+ kruler = callPackage ./graphics/kruler.nix { };
+ ksnapshot = callPackage ./graphics/ksnapshot.nix { };
+ okular = callPackage ./graphics/okular.nix { };
+ };
+
kdesdk = combinePkgs "kdesdk" {
cervisia = callPackage ./sdk/cervisia.nix { };
kapptemplate = callPackage ./sdk/kapptemplate.nix { };
Copied and modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/gwenview.nix
(from r28197, nixpkgs/trunk/pkgs/desktops/kde-4.7/gwenview.nix)
==============================================================================
Copied and modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/kamera.nix
(from r28197, nixpkgs/trunk/pkgs/desktops/kde-4.7/kamera.nix)
==============================================================================
Copied and modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/kgamma.nix
(from r28197, nixpkgs/trunk/pkgs/desktops/kde-4.7/kgamma.nix)
==============================================================================
Copied and modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/kolourpaint.nix (from r28197,
nixpkgs/trunk/pkgs/desktops/kde-4.7/kolourpaint.nix)
==============================================================================
Copied and modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/ksnapshot.nix
(from r28197, nixpkgs/trunk/pkgs/desktops/kde-4.7/ksnapshot.nix)
==============================================================================
Copied and modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/graphics/okular.nix
(from r28197, nixpkgs/trunk/pkgs/desktops/kde-4.7/okular.nix)
==============================================================================
Added: nixpkgs/trunk/pkgs/desktops/kde-4.7/kruler.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kruler.nix Sun Aug 7 00:37:14
2011 (r28210)
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4 }:
+
+kde.package {
+
+ buildInputs = [ cmake kdelibs qt4 automoc4 ];
+
+ meta = {
+ description = "KDE screen ruler";
+ license = "GPLv2";
+ kde.name = "kruler";
+ };
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
