about summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-04-28 08:41:40 +0800
committerPeter Hoeg <peter@hoeg.com>2017-04-28 08:41:58 +0800
commitbf4710fa80808204bb3966f08b1a972439538a0c (patch)
treecb0fbd6040147ed786ce6f775959bd1a6c6ab04f /pkgs/applications/science
parent8d27aad6c36d4999ef723d3a556bdd265f1816da (diff)
downloadnixlib-bf4710fa80808204bb3966f08b1a972439538a0c.tar
nixlib-bf4710fa80808204bb3966f08b1a972439538a0c.tar.gz
nixlib-bf4710fa80808204bb3966f08b1a972439538a0c.tar.bz2
nixlib-bf4710fa80808204bb3966f08b1a972439538a0c.tar.lz
nixlib-bf4710fa80808204bb3966f08b1a972439538a0c.tar.xz
nixlib-bf4710fa80808204bb3966f08b1a972439538a0c.tar.zst
nixlib-bf4710fa80808204bb3966f08b1a972439538a0c.zip
speedcrunch: allow building with qt 5.8
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/math/speedcrunch/default.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index 33de9cd0d975..861deaff741c 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, qtbase, qttools }:
+{ stdenv, fetchgit, cmake, makeQtWrapper, qtbase, qttools }:
 
 stdenv.mkDerivation rec {
   name = "speedcrunch-${version}";
@@ -11,14 +11,20 @@ stdenv.mkDerivation rec {
     sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk";
   };
 
+  enableParallelBuilding = true;
+
   buildInputs = [ qtbase qttools ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake makeQtWrapper ];
 
   preConfigure = ''
     cd src
   '';
 
+  postFixup = ''
+    wrapQtProgram $out/bin/speedcrunch
+  '';
+
   meta = with stdenv.lib; {
     homepage    = http://speedcrunch.org;
     license     = licenses.gpl2Plus;
@@ -30,7 +36,8 @@ stdenv.mkDerivation rec {
       full keyboard-friendly and more than 15 built-in math function.
     '';
     maintainers = with maintainers; [ gebner ];
-    platforms = platforms.all;
-    broken = builtins.compareVersions qtbase.version "5.8.0" >= 0;
+    inherit (qtbase.meta) platforms;
+    # works with qt 5.6 and qt 5.8
+    broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
   };
 }