diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:07:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:09:03 +0200 |
| commit | 6b27ceb006ace21f9157034ac743242a0147eeec (patch) | |
| tree | de8c80579090028b8a918796fd7a8eda3c4cecf0 /pkgs/games/the-butterfly-effect | |
| parent | 14c038dd0390a9b24969f0138356b5c7520b9fdf (diff) | |
| parent | b3bcb59bd5fddc3c0f74bbe120de561bbea29878 (diff) | |
| download | nixpkgs-6b27ceb006ace21f9157034ac743242a0147eeec.tar nixpkgs-6b27ceb006ace21f9157034ac743242a0147eeec.tar.gz nixpkgs-6b27ceb006ace21f9157034ac743242a0147eeec.tar.bz2 nixpkgs-6b27ceb006ace21f9157034ac743242a0147eeec.tar.lz nixpkgs-6b27ceb006ace21f9157034ac743242a0147eeec.tar.xz nixpkgs-6b27ceb006ace21f9157034ac743242a0147eeec.tar.zst nixpkgs-6b27ceb006ace21f9157034ac743242a0147eeec.zip | |
Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e34.
Diffstat (limited to 'pkgs/games/the-butterfly-effect')
| -rw-r--r-- | pkgs/games/the-butterfly-effect/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index cf587ce89dd..68114bb7565 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl, qt4, box2d, which, cmake }: +{ stdenv, fetchgit, qt5, box2d, which, cmake, gettext }: stdenv.mkDerivation rec { name = "tbe-${version}"; - version = "0.9.2.1"; + version = "0.9.3.1"; - src = fetchurl { - url = "https://github.com/kaa-ching/tbe/archive/v${version}.tar.gz"; - sha256 = "1cs4q9qiakfd2m1lvfsvfgf8yvhxzmc06glng5d80piwyn6ymzxg"; + src = fetchgit { + url = "https://github.com/kaa-ching/tbe"; + rev = "refs/tags/v${version}"; + sha256 = "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj"; }; postPatch = "sed '1i#include <vector>' -i src/model/World.h"; - buildInputs = [ qt4 box2d which cmake ]; - + buildInputs = [ + qt5.qtbase qt5.qtsvg qt5.qttranslations box2d which cmake + gettext + ]; enableParallelBuilding = true; installPhase = '' |