Added XPlanet support to kdeedu-4.3.1, not that is an essential feature but it looks cool :-)

svn path=/nixpkgs/trunk/; revision=17054

4 files changed, 25 insertions, 3 deletions

diff --git a/pkgs/applications/science/xplanet/default.nix b/pkgs/applications/science/xplanet/default.nix
new file mode 100644
index 000000000000..cb3c47734bd8
--- /dev/null
+++ b/pkgs/applications/science/xplanet/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, lib, pkgconfig, freetype, pango, libpng, libtiff, giflib, libjpeg}:
+
+stdenv.mkDerivation {
+  name = "xplanet-1.2.1";
+  src = fetchurl {
+    url = mirror://sourceforge/xplanet/xplanet-1.2.1.tar.gz;
+    sha256 = "1pp55a1rgjkfcrwc00y3l48fhpqcp3qagd1zbym6zg27fzi5fbgm";
+  };
+  buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg ];
+  meta = {
+    description = "Renders an image of the earth or other planets into the X root window";
+    homepage = http://xplanet.sourceforge.net;
+    license = "GPL";
+    maintainers = [ lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix
index a79bcb394859..f8036b8303f6 100644
--- a/pkgs/desktops/kde-4.3/default.nix
+++ b/pkgs/desktops/kde-4.3/default.nix
@@ -106,7 +106,7 @@ rec {
   
   kdeedu = import ./edu {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt openbabel boost;
-    inherit (pkgs) readline gmm gsl facile ocaml;
+    inherit (pkgs) readline gmm gsl facile ocaml xplanet;
     inherit kdelibs;
     inherit automoc4 phonon eigen;
   };
diff --git a/pkgs/desktops/kde-4.3/edu/default.nix b/pkgs/desktops/kde-4.3/edu/default.nix
index 12cfa132a020..609e052ceb12 100644
--- a/pkgs/desktops/kde-4.3/edu/default.nix
+++ b/pkgs/desktops/kde-4.3/edu/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
-, facile, ocaml
+, facile, ocaml, xplanet
 , kdelibs, automoc4, phonon, eigen}:
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha1 = "6326cff7779dfadc1b18a3a6bbe7b0750fb7ceaf";
   };
   includeAllQtDirs=true;
-  buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml
+  buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet
                   kdelibs automoc4 phonon eigen ];
   meta = {
     description = "KDE Educative software";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c3e52667af6..0a3d9cf6b073 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7828,6 +7828,12 @@ let
   kdelibs = kde3.kdelibs;
   kdebase = kde3.kdebase;
 
+  ### SCIENCE
+  
+  xplanet = import ../applications/science/xplanet {
+    inherit stdenv fetchurl lib pkgconfig freetype libpng libjpeg giflib libtiff;
+    inherit (gtkLibs) pango;
+  };
 
   ### SCIENCE/GEOMETRY