public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26292 from orivej/instead

Browse Source 
instead: 2.4.1 -> 3.0.0; instead-launcher: 0.6.3 -> 0.7.0
This commit is contained in:
Pascal Wittmann 2017-06-01 18:56:33 +02:00 committed by GitHub
commit ca6a97de23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/instead-launcher/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "instead-launcher-${version}"; name = "instead-launcher-${version}";
version = "0.6.3"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "instead-hub"; owner = "instead-hub";
repo = "instead-launcher"; repo = "instead-launcher";
rev = version; rev = version;
sha256 = "1q0hdgfy9pr48zvxr9x614ka6bd0g8sicdk2a673nwfdyd41p9cw"; sha256 = "1svy8i8anspway01pnz2cy69aad03anvkq04wrdfv1h9c34gbvb9";
}; };
patches = [ ./path.patch ]; patches = [ ./path.patch ];

4
pkgs/games/instead/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }: { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
let let
version = "2.4.1"; version = "3.0.0";
# I took several games at random from http://instead.syscall.ru/games/ # I took several games at random from http://instead.syscall.ru/games/
games = [ games = [
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz"; url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
sha256 = "1i69b10jfb980d5zhmvh1i789hh982vxiwgqna82b84pdf3y7kgw"; sha256 = "14scbb5x36dywak930ry7hwv502jnzc4m5cjkymqn1vz1xkq2m5w";
}; };
NIX_LDFLAGS = "-llua -lgcc_s"; NIX_LDFLAGS = "-llua -lgcc_s";