From 4a5b7854a859f4d6ac6b720d82496711a449ab14 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 22 Feb 2011 11:54:56 +0000
Subject: [PATCH] Move eigen outside of kde-4.x

Michael, sorry for overriding your work but I want to maintain it...

svn path=/nixpkgs/trunk/; revision=26058
---
 pkgs/desktops/kde-4.5/default.nix             |  2 -
 .../kde-4.5/support/eigen/default.nix         | 20 ------
 pkgs/desktops/kde-4.6/default.nix             |  2 -
 .../kde-4.6/support/eigen/default.nix         | 20 ------
 pkgs/development/libraries/eigen/default.nix  | 61 +++++--------------
 5 files changed, 16 insertions(+), 89 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.5/support/eigen/default.nix
 delete mode 100644 pkgs/desktops/kde-4.6/support/eigen/default.nix

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index a42b45c76eaa..d09b4ae3f536 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -33,8 +33,6 @@ recurseIntoAttrs rec {
 
   attica = callPackage ./support/attica { };
 
-  eigen = callPackage ./support/eigen { };
-
   oxygen_icons = callPackage ./support/oxygen-icons { };
 
   polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
diff --git a/pkgs/desktops/kde-4.5/support/eigen/default.nix b/pkgs/desktops/kde-4.5/support/eigen/default.nix
deleted file mode 100644
index e72de6c1b258..000000000000
--- a/pkgs/desktops/kde-4.5/support/eigen/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, cmake}:
-
-let
-  v = "2.0.15";
-in
-stdenv.mkDerivation {
-  name = "eigen-${v}";
-  src = fetchurl {
-    url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
-    name = "eigen-${v}.tar.bz2";
-    sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79";
-  };
-  buildInputs = [ cmake ];
-  meta = {
-    description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
-    license = "LGPL";
-    homepage = http://eigen.tuxfamily.org ;
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-  };
-}
diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix
index bbd6a00e51db..b117535494a3 100644
--- a/pkgs/desktops/kde-4.6/default.nix
+++ b/pkgs/desktops/kde-4.6/default.nix
@@ -32,8 +32,6 @@ rec {
 
   attica = callPackage ./support/attica { };
 
-  eigen = callPackage ./support/eigen { };
-
   oxygen_icons = callPackage ./oxygen-icons { };
 
   polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
diff --git a/pkgs/desktops/kde-4.6/support/eigen/default.nix b/pkgs/desktops/kde-4.6/support/eigen/default.nix
deleted file mode 100644
index e72de6c1b258..000000000000
--- a/pkgs/desktops/kde-4.6/support/eigen/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, cmake}:
-
-let
-  v = "2.0.15";
-in
-stdenv.mkDerivation {
-  name = "eigen-${v}";
-  src = fetchurl {
-    url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
-    name = "eigen-${v}.tar.bz2";
-    sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79";
-  };
-  buildInputs = [ cmake ];
-  meta = {
-    description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
-    license = "LGPL";
-    homepage = http://eigen.tuxfamily.org ;
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-  };
-}
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index bd705fac9835..c475682c672d 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,49 +1,20 @@
-x@{builderDefsPackage
-  , cmake
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{stdenv, fetchurl, cmake}:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="eigen";
-    version="2.0.15";
-    name="${baseName}-${version}";
-    ext="tar.bz2";
-    project="${baseName}";
-    url="http://bitbucket.org/${project}/${baseName}/get/${version}.${ext}";
-    hash="c68509b80ec2570d025a98e6c4279062b801593c5165ba3d683852e7dbff1569";
-  };
+let
+  v = "2.0.15";
 in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-    name="${sourceInfo.name}.${sourceInfo.ext}";
+stdenv.mkDerivation {
+  name = "eigen-${v}";
+  src = fetchurl {
+    url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
+    name = "eigen-${v}.tar.bz2";
+    sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79";
   };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  phaseNames = ["doCmake" "doMakeInstall"];
-      
-  meta = {
-    description = "A C++ linear algebra template header";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl3Plus;
+  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 ];
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://eigen.tuxfamily.org/index.php?title=Main_Page";
-    };
-  };
-}) x
+}