diff options
author | Karn Kallio <tierpluspluslists@gmail.com> | 2011-08-07 00:38:11 +0000 |
---|---|---|
committer | Karn Kallio <tierpluspluslists@gmail.com> | 2011-08-07 00:38:11 +0000 |
commit | 278cc6dc0bef65185ea9dc74d0dba2c0eb43215b (patch) | |
tree | f5f7e3396b56dbd3821b2525f9e83e6cd0526d15 /pkgs/desktops | |
parent | 37c45263c6a5a4f9c813638294a851d63c82de09 (diff) |
First few programs of kde 4.7 kdeedu.
svn path=/nixpkgs/trunk/; revision=28213
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/kde-4.7/default.nix | 13 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.7/edu/default.nix | 32 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.7/edu/klettres.nix | 12 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.7/edu/kmplot.nix | 12 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.7/edu/kstars.nix | 12 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.7/edu/rocs.nix | 14 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.7/edu/step.nix | 12 |
7 files changed, 73 insertions, 34 deletions
diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 05f9d56ba0236..0bf9cafd1c463 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,4 +1,4 @@ -{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47, system_config_printer } @ args: +{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47, system_config_printer, boost } @ args: let @@ -106,11 +106,20 @@ recurseIntoAttrs rec { /* kdeedu = callPackage ./edu { }; - kdegraphics = callPackage ./graphics { }; kdenetwork = callPackage ./network { }; kdeplasma_addons = callPackage ./plasma-addons { }; */ + kdeedu = combinePkgs "kdeedu" { + klettres = callPackage ./edu/klettres.nix { }; + kmplot = callPackage ./edu/kmplot.nix { }; + kstars = callPackage ./edu/kstars.nix { }; + rocs = callPackage ./edu/rocs.nix { + boost = args.boost.override {enableExceptions = true;}; + }; + step = callPackage ./edu/step.nix { }; + }; + kdegraphics = combinePkgs "kdegraphics" { gwenview = callPackage ./graphics/gwenview.nix { }; kamera = callPackage ./graphics/kamera.nix { }; diff --git a/pkgs/desktops/kde-4.7/edu/default.nix b/pkgs/desktops/kde-4.7/edu/default.nix deleted file mode 100644 index f9132de8739a8..0000000000000 --- a/pkgs/desktops/kde-4.7/edu/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ kde, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl -, xplanet, libspectre, pkgconfig, libqalculate, python -, kdelibs, automoc4, eigen, attica}: - -kde.package { - -#TODO: -#* Boost.Python (1.31 or higher) <http://www.boost.org/> - fails to find -# * libcfitsio0 (3.09 or higher) <http://indi.sf.net> -# * libindi (0.6.1 or higher) <http://indi.sf.net> -# * R <http://www.r-project.org/> -# * OCaml <http://caml.inria.fr/> -# * LibFacile <http://www.recherche.enac.fr/log/facile/> -# * Avogadro (1.0 or higher) <http://avogadro.openmolecules.net> -# * libgps - - buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm - gsl xplanet kdelibs automoc4 eigen attica libspectre pkgconfig - libqalculate python ]; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${python}/include/${python.libPrefix}" - export NIX_LDFLAGS="$NIX_LDFLAGS -l${python.libPrefix} -lboost_python" - ''; - cmakeFlags = '' -DBOOST_PYTHON_INCLUDES="${boost}/include" -DBOOST_PYTHON_LIBS="boost_python" -DKIG_ENABLE_PYTHON_SCRIPTING=1''; - - meta = { - description = "KDE educational software"; - license = "GPL"; - kde.name = "kdeedu"; - }; -} diff --git a/pkgs/desktops/kde-4.7/edu/klettres.nix b/pkgs/desktops/kde-4.7/edu/klettres.nix new file mode 100644 index 0000000000000..80863eae5001d --- /dev/null +++ b/pkgs/desktops/kde-4.7/edu/klettres.nix @@ -0,0 +1,12 @@ +{ kde, cmake, kdelibs, qt4, automoc4, phonon }: + +kde.package { + buildInputs = [ cmake kdelibs qt4 automoc4 phonon ]; + + meta = { + description = "A KDE alphabet tutorial"; + kde = { + name = "klettres"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.7/edu/kmplot.nix b/pkgs/desktops/kde-4.7/edu/kmplot.nix new file mode 100644 index 0000000000000..b7f6bc3e79d9d --- /dev/null +++ b/pkgs/desktops/kde-4.7/edu/kmplot.nix @@ -0,0 +1,12 @@ +{ kde, cmake, kdelibs, qt4, automoc4, phonon }: + +kde.package { + buildInputs = [ cmake kdelibs qt4 automoc4 phonon ]; + + meta = { + description = "A KDE mathematical function plotter"; + kde = { + name = "kmplot"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.7/edu/kstars.nix b/pkgs/desktops/kde-4.7/edu/kstars.nix new file mode 100644 index 0000000000000..ce6f6795056a1 --- /dev/null +++ b/pkgs/desktops/kde-4.7/edu/kstars.nix @@ -0,0 +1,12 @@ +{ kde, cmake, kdelibs, qt4, automoc4, phonon, eigen, xplanet, indilib }: + +kde.package { + buildInputs = [ cmake kdelibs qt4 automoc4 phonon eigen xplanet indilib ]; + + meta = { + description = "A KDE graphical desktop planetarium"; + kde = { + name = "kstars"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.7/edu/rocs.nix b/pkgs/desktops/kde-4.7/edu/rocs.nix new file mode 100644 index 0000000000000..dd31dddb9032d --- /dev/null +++ b/pkgs/desktops/kde-4.7/edu/rocs.nix @@ -0,0 +1,14 @@ +{ kde, cmake, kdelibs, qt4, automoc4, phonon, boost, perl }: + +kde.package { + buildInputs = [ cmake kdelibs qt4 automoc4 phonon boost perl ]; + + NIX_CFLAGS_COMPILE = "-fexceptions"; + + meta = { + description = "A KDE graph theory viewer"; + kde = { + name = "rocs"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.7/edu/step.nix b/pkgs/desktops/kde-4.7/edu/step.nix new file mode 100644 index 0000000000000..50fca449bc497 --- /dev/null +++ b/pkgs/desktops/kde-4.7/edu/step.nix @@ -0,0 +1,12 @@ +{ kde, cmake, kdelibs, qt4, automoc4, phonon, gsl, libqalculate, eigen }: + +kde.package { + buildInputs = [ cmake kdelibs qt4 automoc4 phonon gsl libqalculate eigen ]; + + meta = { + description = "A KDE interactive physical simulator"; + kde = { + name = "step"; + }; + }; +} |