dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #55717 from plapadoo/pro-office-calulator-1.0.13

Browse Source 
pro-office-calculator: 1.0.6 -> 1.0.13
This commit is contained in:
worldofpeace 2019-02-17 03:56:02 +00:00 committed by GitHub
commit cc5ccf4579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/games/pro-office-calculator/default.nix
View File

@ -1,23 +1,17 @@
{ stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia, fetchpatch }: { stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.6"; version = "1.0.13";
name = "pro-office-calculator-${version}"; name = "pro-office-calculator-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RobJinman"; owner = "RobJinman";
repo = "pro_office_calc"; repo = "pro_office_calc";
rev = "v${version}"; rev = "v${version}";
sha256 = "1irgch6cbc2f8il1zh8qf98m43h41hma80dxzz9c7xvbvl99lybd"; sha256 = "1v75cysargmp4fk7px5zgib1p6h5ya4w39rndbzk614fcnv0iipd";
}; };
buildInputs = [ qtbase qtmultimedia tinyxml-2 ]; buildInputs = [ qtbase qtmultimedia tinyxml-2 ];
# This fixes a bug resulting in "illegal instruction"
patches = [(fetchpatch {
url = https://github.com/RobJinman/pro_office_calc/commit/806180d69d4af6b3183873f471c57bfdaf529560.patch;
sha256 = "1rcdjy233yf3kv4v18c82jyg08dykj2qspvg08n5b3bir870sbxz";
})];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; { meta = with stdenv.lib; {