summary refs log tree commit diff
path: root/pkgs/applications/science/math/speedcrunch/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-02-03 11:47:38 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-02-03 11:47:38 +0100
commitadab4cd58b06896be6436f93a76432811deb897e (patch)
treed4dec437b37d500a136f35ead5290ba15c338ee3 /pkgs/applications/science/math/speedcrunch/default.nix
parent787c1add0ba40ba8094b0ed4001de10c7d05c033 (diff)
parent5b759293e09a062373d4b2843c5bad89d5a47165 (diff)
downloadnixlib-adab4cd58b06896be6436f93a76432811deb897e.tar
nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.gz
nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.bz2
nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.lz
nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.xz
nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.zst
nixlib-adab4cd58b06896be6436f93a76432811deb897e.zip
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/science/math/speedcrunch/default.nix')
-rw-r--r--pkgs/applications/science/math/speedcrunch/default.nix20
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index 56ae454831b1..334423660a03 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -1,19 +1,23 @@
-{ stdenv, fetchurl, qt, cmake }:
+{ stdenv, fetchgit, cmake, qtbase, qttools }:
 
 stdenv.mkDerivation rec {
   name = "speedcrunch-${version}";
-  version = "0.11";
+  version = "0.12.0";
 
-  src = fetchurl {
-    url = "https://bitbucket.org/heldercorreia/speedcrunch/get/${version}.tar.gz";
-    sha256 = "0phba14z9jmbmax99klbxnffwzv3awlzyhpcwr1c9lmyqnbcsnkd";
+  src = fetchgit {
+    # the tagging is not standard, so you probably need to check this when updating
+    rev = "refs/tags/release-${version}";
+    url = "https://bitbucket.org/heldercorreia/speedcrunch";
+    sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk";
   };
 
-  buildInputs = [cmake qt];
+  buildInputs = [ qtbase qttools ];
 
-  dontUseCmakeBuildDir = true;
+  nativeBuildInputs = [ cmake ];
 
-  cmakeDir = "src";
+  preConfigure = ''
+    cd src
+  '';
 
   meta = with stdenv.lib; {
     homepage    = http://speedcrunch.org;