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

Merge pull request #67271 from dtzWill/update/solarus-1.6.2

Browse Source 
solarus{,-quest-editor}: 1.6.0 -> 1.6.2
This commit is contained in:
Marek Mahut 2019-08-23 08:06:24 +02:00 committed by GitHub
commit c805c7657d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/solarus-quest-editor/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitLab, cmake, luajit,
{ lib, mkDerivation, fetchFromGitLab, cmake, luajit,
SDL2, SDL2_image, SDL2_ttf, physfs,
openal, libmodplug, libvorbis, solarus,
qtbase, qttools, glm }:
stdenv.mkDerivation rec {
name = "solarus-quest-editor-${version}";
version = "1.6.0";
mkDerivation rec {
pname = "solarus-quest-editor";
version = "1.6.2";
src = fetchFromGitLab {
owner = "solarus-games";
repo = "solarus-quest-editor";
repo = pname;
rev = "v${version}";
sha256 = "1a7816kaljfh9ynzy9g36mqzzv2p800nnbrja73q6vjfrsv3vq4c";
sha256 = "0dq94iw9ldl4p83dqcwjs5ilpkvz5jgdk8rbls8pf8b7afpg36rz";
};
buildInputs = [ cmake luajit SDL2
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
openal libmodplug libvorbis
solarus qtbase qttools glm ];
meta = with stdenv.lib; {
meta = with lib; {
description = "The editor for the Zelda-like ARPG game engine, Solarus";
longDescription = ''
Solarus is a game engine for Zelda-like ARPG games written in lua.

16
pkgs/games/solarus/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitLab, cmake, luajit,
{ lib, mkDerivation, fetchFromGitLab, cmake, luajit,
SDL2, SDL2_image, SDL2_ttf, physfs,
openal, libmodplug, libvorbis,
qtbase, qttools }:
stdenv.mkDerivation rec {
name = "solarus-${version}";
version = "1.6.0";
mkDerivation rec {
pname = "solarus";
version = "1.6.2";
src = fetchFromGitLab {
owner = "solarus-games";
repo = "solarus";
rev = "v1.6.0";
sha256 = "0mlpa1ijaxy84f7xjgs2kjnpm035b8q9ckva6lg14q49gzy10fr2";
repo = pname;
rev = "v${version}";
sha256 = "0d0xfjbmamz84aajxfc0fwrj8862xxbxz6n4xnc05r1m4g7gba77";
};
buildInputs = [ cmake luajit SDL2
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "A Zelda-like ARPG game engine";
longDescription = ''
Solarus is a game engine for Zelda-like ARPG games written in lua.