diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-14 12:44:24 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-14 22:23:36 +0100 |
| commit | b956b7742329c67b942dd04017f8b92a8ab4796f (patch) | |
| tree | 40867144d9c69177e0b7acfad3d70a95fa01c096 | |
| parent | 93b3d24b96049e0e0cd88ae737976d46b43993a1 (diff) | |
| download | nixpkgs-b956b7742329c67b942dd04017f8b92a8ab4796f.tar nixpkgs-b956b7742329c67b942dd04017f8b92a8ab4796f.tar.gz nixpkgs-b956b7742329c67b942dd04017f8b92a8ab4796f.tar.bz2 nixpkgs-b956b7742329c67b942dd04017f8b92a8ab4796f.tar.lz nixpkgs-b956b7742329c67b942dd04017f8b92a8ab4796f.tar.xz nixpkgs-b956b7742329c67b942dd04017f8b92a8ab4796f.tar.zst nixpkgs-b956b7742329c67b942dd04017f8b92a8ab4796f.zip | |
eigen: adding back eigen 2.0, for kde.
Kdeedu wants eigen 2.0.
| -rw-r--r-- | pkgs/development/libraries/eigen/2.0.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
2 files changed, 33 insertions, 2 deletions
diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix new file mode 100644 index 00000000000..6884aca16fc --- /dev/null +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, cmake}: + +let + v = "2.0.16"; +in +stdenv.mkDerivation { + name = "eigen-${v}"; + + src = fetchurl { + url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; + name = "eigen-${v}.tar.bz2"; + sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0"; + }; + + buildNativeInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; + license = licenses.lgpl3Plus; + homepage = http://eigen.tuxfamily.org ; + maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d291708df88..96cf6be30e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3515,6 +3515,8 @@ let eigen = callPackage ../development/libraries/eigen {}; + eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; + enchant = callPackage ../development/libraries/enchant { }; enet = callPackage ../development/libraries/enet { }; @@ -8425,9 +8427,15 @@ let kde4 = recurseIntoAttrs pkgs.kde47; - kde47 = kdePackagesFor (pkgs.kde47 // {boost = boost149;}) ../desktops/kde-4.7; + kde47 = kdePackagesFor (pkgs.kde47 // { + boost = boost149; + eigen = eigen2; + }) ../desktops/kde-4.7; - kde48 = kdePackagesFor (pkgs.kde48 // {boost = boost149;}) ../desktops/kde-4.8; + kde48 = kdePackagesFor (pkgs.kde48 // { + boost = boost149; + eigen = eigen2; + }) ../desktops/kde-4.8; kdePackagesFor = self: dir: let callPackageOrig = callPackage; in |