speedcrunch: allow building with qt 5.8

NixOS · Apr 28, 2017 · bf4710f · bf4710f
1 parent 8d27aad
commit bf4710f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git 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;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -17765,7 +17765,7 @@ with pkgs;
 
   yacas = callPackage ../applications/science/math/yacas { };
 
-  speedcrunch = libsForQt56.callPackage ../applications/science/math/speedcrunch { };
+  speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { };
 
   ### SCIENCE / MISC