ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

instead: 3.3.0 -> 3.3.1

Browse Source
This commit is contained in:
Orivej Desh 2019-12-08 23:35:30 +00:00
parent a1eee8245f
commit 5bd1bd08ed
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }:
let
version = "3.3.0";
version = "3.3.1";
# I took several games at random from http://instead.syscall.ru/games/
games = [
@ -33,13 +33,13 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
sha256 = "0kskwrq2gy1gpp97134sjrw08ip1h6i5dc64zrbl9yv7jaz4by69";
sha256 = "10bppcdjnd0all71l5akdvy7fx0c8s8x0za9qxszs8cjmlv9z1q0";
};
NIX_LDFLAGS = "-llua -lgcc_s";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ SDL SDL_ttf SDL_image SDL_mixer lua zlib unzip ];
nativeBuildInputs = [ pkgconfig unzip ];
buildInputs = [ SDL2 SDL2_ttf SDL2_image SDL2_mixer lua zlib ];
configurePhase = ''
{ echo 2; echo $out; } | ./configure.sh
@ -47,9 +47,7 @@ stdenv.mkDerivation {
inherit games;
installPhase = ''
make install
postInstall = ''
pushd $out/share/instead/games
for a in $games; do
unzip $a
@ -57,6 +55,8 @@ stdenv.mkDerivation {
popd
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Simple text adventure interpreter for Unix and Windows";
homepage = http://instead.syscall.ru/;

4
pkgs/top-level/all-packages.nix
View File

@ -22841,9 +22841,7 @@ in
ideogram = callPackage ../applications/graphics/ideogram { };
instead = callPackage ../games/instead {
lua = lua5;
};
instead = callPackage ../games/instead { };
instead-launcher = callPackage ../games/instead-launcher { };