diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-09-04 22:03:56 -0400 |
---|---|---|
committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-09-04 22:03:56 -0400 |
commit | 83a0d5d0139c0650b74e83cb2160907ddcf7a7d5 (patch) | |
tree | d956f4b3eedb443bba8542e97ff28e5cd652913c /pkgs | |
parent | 4477cf04b6779a537cdb5f0bd3dd30e75aeb4a3b (diff) | |
download | nixpkgs-83a0d5d0139c0650b74e83cb2160907ddcf7a7d5.tar nixpkgs-83a0d5d0139c0650b74e83cb2160907ddcf7a7d5.tar.gz nixpkgs-83a0d5d0139c0650b74e83cb2160907ddcf7a7d5.tar.bz2 nixpkgs-83a0d5d0139c0650b74e83cb2160907ddcf7a7d5.tar.lz nixpkgs-83a0d5d0139c0650b74e83cb2160907ddcf7a7d5.tar.xz nixpkgs-83a0d5d0139c0650b74e83cb2160907ddcf7a7d5.tar.zst nixpkgs-83a0d5d0139c0650b74e83cb2160907ddcf7a7d5.zip |
solarus: 1.4.5 -> 1.5.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/solarus/default.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index 6f7876e4872..23abadf66ae 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchFromGitHub, cmake, luajit, +{ stdenv, fetchFromGitLab, cmake, luajit, SDL2, SDL2_image, SDL2_ttf, physfs, - openal, libmodplug, libvorbis}: + openal, libmodplug, libvorbis, + qtbase, qttools }: stdenv.mkDerivation rec { name = "solarus-${version}"; - version = "1.4.5"; + version = "1.5.3"; - src = fetchFromGitHub { - owner = "christopho"; + src = fetchFromGitLab { + owner = "solarus-games"; repo = "solarus"; - rev = "d9fdb9fdb4e1b9fc384730a9279d134ae9f2c70e"; - sha256 = "0xjx789d6crm322wmkqyq9r288vddsha59yavhy78c4r01gs1p5v"; + rev = "v1.5.3"; + sha256 = "035hkdw3a1ryasj5wfa1xla1xmpnc3hjp4s20sl9ywip41675vaz"; }; buildInputs = [ cmake luajit SDL2 SDL2_image SDL2_ttf physfs - openal libmodplug libvorbis ]; + openal libmodplug libvorbis + qtbase qttools ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 436c44609ec..23d24aa0473 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20157,7 +20157,7 @@ with pkgs; lua = lua5_1; }; - solarus = callPackage ../games/solarus { }; + solarus = libsForQt5.callPackage ../games/solarus { }; solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; |