speedcrunch: 0.11-alpha -> 0.11

pkgs/applications/science/math/speedcrunch/default.nix

@@ -1,30 +1,22 @@
 { stdenv, fetchurl, qt, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "speedcrunch-0.11-alpha";
+  name = "speedcrunch-${version}";
+  version = "0.11";
 
   src = fetchurl {
-    url = "http://speedcrunch.googlecode.com/files/${name}.tar.gz";
-    sha256 = "c6d6328e0c018cd8b98a0e86fb6c49fedbab5dcc831b47fbbc1537730ff80882";
+    url = "https://bitbucket.org/heldercorreia/speedcrunch/get/${version}.tar.gz";
+    sha256 = "0phba14z9jmbmax99klbxnffwzv3awlzyhpcwr1c9lmyqnbcsnkd";
   };
 
-  patches = [./speedcrunch-0.11-alpha-dso_linking.patch];
-
   buildInputs = [cmake qt];
 
   dontUseCmakeBuildDir = true;
 
-  cmakeDir = "../src";
-
-  preConfigure = ''
-    mkdir -p build
-    cd build
-  '';
-
-  buildFlags = "VERBOSE=1";
+  cmakeDir = "src";
 
   meta = with stdenv.lib; {
-    homepage    = "http://speedcrunch.digitalfanatics.org";
+    homepage    = http://speedcrunch.org;
     license     = licenses.gpl2Plus;
     description = "A fast power user calculator";
     longDescription = ''
@@ -33,6 +25,8 @@ stdenv.mkDerivation rec {
       precisions, unlimited variable storage, intelligent automatic completion
       full keyboard-friendly and more than 15 built-in math function.
     '';
+    maintainers = with maintainers; [ gebner ];
+    platforms = platforms.all;
   };
 
 }

pkgs/applications/science/math/speedcrunch/speedcrunch-0.11-alpha-dso_linking.patch

@@ -1,23 +0,0 @@
-diff -up speedcrunch-0.11-alpha/src/CMakeLists.txt.dso_linking speedcrunch-0.11-alpha/src/CMakeLists.txt
---- speedcrunch-0.11-alpha/src/CMakeLists.txt.dso_linking	2009-11-04 15:37:15.000000000 -0600
-+++ speedcrunch-0.11-alpha/src/CMakeLists.txt	2010-06-25 13:25:07.133460528 -0500
-@@ -54,6 +54,10 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX )
- SET(QT_USE_QTNETWORK TRUE)
- #SET(QT_USE_QTXML TRUE)
- find_package(Qt4 REQUIRED)
-+if (Q_WS_X11)
-+   find_package(X11 REQUIRED)
-+endif (Q_WS_X11)
-+
- include(${QT_USE_FILE})
- 
- # build everything
-@@ -80,7 +84,7 @@ ENDIF( APPLE )
- 
- ADD_CUSTOM_TARGET( confclean COMMAND rm -rf Makefile CMakeFiles/ CMakeCache.txt cmake_install.cmake DartTestfile.txt install_manifest.txt )
- 
--TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES})
-+TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES} ${X11_X11_LIB} )
- # only needed for static builds when directx is enabled in qt and you
- # get a linker error because of missing a directx function
- #IF(WIN32)