diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 4467ae338e4..1c152195d68 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, -shared_desktop_ontologies, marble, clapack, mysql }: +shared_desktop_ontologies, marble, mysql }: stdenv.mkDerivation rec { name = "digikam-2.5.0"; diff --git a/pkgs/development/libraries/clapack/default.nix b/pkgs/development/libraries/clapack/default.nix deleted file mode 100644 index 6b10d31e111..00000000000 --- a/pkgs/development/libraries/clapack/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, cmake, withPIC ? false }: - -stdenv.mkDerivation rec { - name = "clapack-3.2.1"; - - src = fetchurl { - url = http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz; - sha256 = "0nnap9q1mv14g57dl3vkvxrdr10k5w7zzyxs6rgxhia8q8mphgqb"; - }; - - buildNativeInputs = [ cmake ]; - - installPhase = '' - ensureDir $out/include $out/lib - cp SRC/*.a F2CLIBS/libf2c/*.a BLAS/SRC/*.a $out/lib - cp ../INCLUDE/* $out/include - ''; - - cmakeFlags = if withPIC then "-DCMAKE_C_FLAGS=-fPIC" else ""; - - # We disable the test phase, because some tests fail. - # Forums say it's normal for some to fail: - # http://icl.cs.utk.edu/lapack-forum/viewtopic.php?f=2&t=167 - # doCheck = true; - # checkPhase = "ctest"; - - meta = { - homepage = http://www.netlib.org/clapack/; - description = "f2c'ed version of LAPACK"; - license = "BSD"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36cffb34b88..84a34a75118 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3299,8 +3299,6 @@ let clanlib = callPackage ../development/libraries/clanlib { }; - clapack = callPackage ../development/libraries/clapack { }; - classads = callPackage ../development/libraries/classads { }; classpath = callPackage ../development/libraries/java/classpath {