mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-29 06:45:54 +03:00
Upgraded KDE EDU to 4.3.1
svn path=/nixpkgs/trunk/; revision=17011
This commit is contained in:
parent
48497bd320
commit
33d7ae6288
@ -105,10 +105,10 @@ rec {
|
||||
};
|
||||
|
||||
kdeedu = import ./edu {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt openbabel boost;
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt openbabel boost;
|
||||
inherit (pkgs) readline gmm gsl facile ocaml;
|
||||
inherit kdelibs;
|
||||
inherit automoc4 phonon;
|
||||
inherit automoc4 phonon eigen;
|
||||
};
|
||||
|
||||
kdegraphics = import ./graphics {
|
||||
|
@ -1,14 +1,20 @@
|
||||
{stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl,
|
||||
facile, ocaml,
|
||||
kdelibs, automoc4, phonon}:
|
||||
{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
|
||||
, facile, ocaml
|
||||
, kdelibs, automoc4, phonon, eigen}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdeedu-4.2.4";
|
||||
name = "kdeedu-4.3.1";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.2.4/src/kdeedu-4.2.4.tar.bz2;
|
||||
sha1 = "7b26b946e1981ac57efdd2059eb3bba2808aef4b";
|
||||
url = mirror://kde/stable/4.3.1/src/kdeedu-4.3.1.tar.bz2;
|
||||
sha1 = "6326cff7779dfadc1b18a3a6bbe7b0750fb7ceaf";
|
||||
};
|
||||
includeAllQtDirs=true;
|
||||
buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml
|
||||
kdelibs automoc4 phonon ];
|
||||
kdelibs automoc4 phonon eigen ];
|
||||
meta = {
|
||||
description = "KDE Educative software";
|
||||
license = "GPL";
|
||||
homepage = http://www.kde.org;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user