Author: eelco
Date: Fri Jul 29 17:24:59 2011
New Revision: 28006
URL: https://svn.nixos.org/websvn/nix/?rev=28006&sc=1
Log:
* More stuff.
Added:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kgamma.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kipi-plugins.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kolourpaint.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libkdcraw.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kamera.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 29
16:09:55 2011 (r28005)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 29
17:24:59 2011 (r28006)
@@ -40,7 +40,9 @@
libkipi = callPackage ./libkipi.nix { };
- #kipi_plugins = callPackage ./kipi-plugins { };
+ libkdcraw = callPackage ./libkdcraw.nix { };
+
+ kipi_plugins = callPackage ./kipi-plugins.nix { };
### LIBS
@@ -87,6 +89,10 @@
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 { };
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kamera.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kamera.nix Fri Jul 29
16:09:55 2011 (r28005)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kamera.nix Fri Jul 29
17:24:59 2011 (r28006)
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4, libgphoto2 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon, libgphoto2 }:
kde.package {
- buildInputs = [ cmake kdelibs qt4 automoc4 libgphoto2 ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon libgphoto2 ];
meta = {
description = "KDE camera interface library";
Added: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kgamma.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kgamma.nix Fri Jul 29
17:24:59 2011 (r28006)
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon, libXxf86vm }:
+
+kde.package {
+
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon libXxf86vm ];
+
+ meta = {
+ description = "KDE monitor calibration tool";
+ license = "GPLv2";
+ kde.name = "kgamma";
+ };
+}
Added: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kipi-plugins.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kipi-plugins.nix Fri Jul
29 17:24:59 2011 (r28006)
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, kdelibs, qt4, automoc4, phonon, libkexiv2
+, libkdcraw, libkipi, gettext, libxml2, libxslt, qjson, qca2
+, kdepimlibs }:
+
+stdenv.mkDerivation rec {
+ name = "kipi-plugins-1.9.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/kipi/${name}.tar.bz2";
+ sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m";
+ };
+
+ buildInputs =
+ # Some dependencies are missing because they are very big (OpenCV,
+ # GTK).
+ [ cmake kdelibs qt4 automoc4 phonon libkexiv2 libkdcraw libkipi
+ gettext libxml2 libxslt qjson qca2 kdepimlibs
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Photo Management Program";
+ license = "GPL";
+ homepage = http://www.kipi-plugins.org;
+ inherit (kdelibs.meta) platforms;
+ maintainers = with stdenv.lib.maintainers; [ viric urkud ];
+ };
+}
Added: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kolourpaint.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kolourpaint.nix Fri Jul
29 17:24:59 2011 (r28006)
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon, qimageblitz }:
+
+kde.package {
+
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon qimageblitz ];
+
+ meta = {
+ description = "KDE paint program";
+ license = "GPLv2";
+ kde.name = "kolourpaint";
+ };
+}
Added: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libkdcraw.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libkdcraw.nix Fri Jul
29 17:24:59 2011 (r28006)
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
+
+kde.package {
+
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
+
+ meta = {
+ description = "Library for decoding RAW images";
+ license = "GPLv2";
+ kde.name = "libkdcraw";
+ };
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
