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

instead: 3.3.1 -> 3.3.2; fix compilation

This commit is contained in:
marius david 2020-09-09 18:23:23 +02:00 committed by Jon
parent 7e5991ede7
commit 43d9d1d7d8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }: { stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }:
let let
version = "3.3.1"; version = "3.3.2";
# 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 {
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 = "10bppcdjnd0all71l5akdvy7fx0c8s8x0za9qxszs8cjmlv9z1q0"; sha256 = "u5j2kDKRvMQPsG8iA6uOBScuyE/e1BJIK2+qVL6jqQs=";
}; };
NIX_LDFLAGS = "-llua -lgcc_s"; NIX_LDFLAGS = "-llua -lgcc_s";
@ -41,6 +41,11 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig unzip ]; nativeBuildInputs = [ pkgconfig unzip ];
buildInputs = [ SDL2 SDL2_ttf SDL2_image SDL2_mixer lua zlib ]; buildInputs = [ SDL2 SDL2_ttf SDL2_image SDL2_mixer lua zlib ];
postPatch = ''
substituteInPlace configure.sh \
--replace "/tmp/sdl-test" $(mktemp)
'';
configurePhase = '' configurePhase = ''
{ echo 2; echo $out; } | ./configure.sh { echo 2; echo $out; } | ./configure.sh
''; '';