diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-02-17 03:56:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-17 03:56:02 +0000 |
| commit | cc5ccf45794687d0bc8dced0412ae8954f4b8296 (patch) | |
| tree | 4dc7f22245c1c1a6dad206679e3e2141454671a0 /pkgs/games | |
| parent | 3eec4b57c20742b6306c4f8d6ef8135c22979f4b (diff) | |
| parent | e4239350df61939414e40da3d8044a7221f13d1c (diff) | |
| download | nixpkgs-cc5ccf45794687d0bc8dced0412ae8954f4b8296.tar nixpkgs-cc5ccf45794687d0bc8dced0412ae8954f4b8296.tar.gz nixpkgs-cc5ccf45794687d0bc8dced0412ae8954f4b8296.tar.bz2 nixpkgs-cc5ccf45794687d0bc8dced0412ae8954f4b8296.tar.lz nixpkgs-cc5ccf45794687d0bc8dced0412ae8954f4b8296.tar.xz nixpkgs-cc5ccf45794687d0bc8dced0412ae8954f4b8296.tar.zst nixpkgs-cc5ccf45794687d0bc8dced0412ae8954f4b8296.zip | |
Merge pull request #55717 from plapadoo/pro-office-calulator-1.0.13
pro-office-calculator: 1.0.6 -> 1.0.13
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/pro-office-calculator/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix index f7eebea7563..0fcf5c60c2b 100644 --- a/pkgs/games/pro-office-calculator/default.nix +++ b/pkgs/games/pro-office-calculator/default.nix @@ -1,23 +1,17 @@ { stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia, fetchpatch }: stdenv.mkDerivation rec { - version = "1.0.6"; + version = "1.0.13"; name = "pro-office-calculator-${version}"; src = fetchFromGitHub { owner = "RobJinman"; repo = "pro_office_calc"; rev = "v${version}"; - sha256 = "1irgch6cbc2f8il1zh8qf98m43h41hma80dxzz9c7xvbvl99lybd"; + sha256 = "1v75cysargmp4fk7px5zgib1p6h5ya4w39rndbzk614fcnv0iipd"; }; 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 ]; meta = with stdenv.lib; { |