public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

speedcrunch: allow building with qt 5.8

This commit is contained in:
Peter Hoeg 2017-04-28 08:41:40 +08:00
parent 8d27aad6c3
commit bf4710fa80
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/science/math/speedcrunch/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, cmake, qtbase, qttools }: { stdenv, fetchgit, cmake, makeQtWrapper, qtbase, qttools }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "speedcrunch-${version}"; name = "speedcrunch-${version}";
@ -11,14 +11,20 @@ stdenv.mkDerivation rec {
sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk"; sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk";
}; };
enableParallelBuilding = true;
buildInputs = [ qtbase qttools ]; buildInputs = [ qtbase qttools ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake makeQtWrapper ];
preConfigure = '' preConfigure = ''
cd src cd src
''; '';
postFixup = ''
wrapQtProgram $out/bin/speedcrunch
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://speedcrunch.org; homepage = http://speedcrunch.org;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
@ -30,7 +36,8 @@ stdenv.mkDerivation rec {
full keyboard-friendly and more than 15 built-in math function. full keyboard-friendly and more than 15 built-in math function.
''; '';
maintainers = with maintainers; [ gebner ]; maintainers = with maintainers; [ gebner ];
platforms = platforms.all; inherit (qtbase.meta) platforms;
broken = builtins.compareVersions qtbase.version "5.8.0" >= 0; # works with qt 5.6 and qt 5.8
broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -17765,7 +17765,7 @@ with pkgs;
yacas = callPackage ../applications/science/math/yacas { }; yacas = callPackage ../applications/science/math/yacas { };
speedcrunch = libsForQt56.callPackage ../applications/science/math/speedcrunch { }; speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { };
### SCIENCE / MISC ### SCIENCE / MISC