diff options
| author | Orivej Desh <orivej@gmx.fr> | 2019-12-08 23:35:30 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2019-12-09 00:17:28 +0000 |
| commit | 5bd1bd08ed4e7bc10a5d426b9b02e212e9a08f8b (patch) | |
| tree | 40c2d0d2e17ce3ac2ff6de0728943b326fc6d96c /pkgs/games/instead | |
| parent | a1eee8245f5953a3ccc9a114a5ddfac0a6a976cd (diff) | |
| download | nixpkgs-5bd1bd08ed4e7bc10a5d426b9b02e212e9a08f8b.tar nixpkgs-5bd1bd08ed4e7bc10a5d426b9b02e212e9a08f8b.tar.gz nixpkgs-5bd1bd08ed4e7bc10a5d426b9b02e212e9a08f8b.tar.bz2 nixpkgs-5bd1bd08ed4e7bc10a5d426b9b02e212e9a08f8b.tar.lz nixpkgs-5bd1bd08ed4e7bc10a5d426b9b02e212e9a08f8b.tar.xz nixpkgs-5bd1bd08ed4e7bc10a5d426b9b02e212e9a08f8b.tar.zst nixpkgs-5bd1bd08ed4e7bc10a5d426b9b02e212e9a08f8b.zip | |
instead: 3.3.0 -> 3.3.1
Diffstat (limited to 'pkgs/games/instead')
| -rw-r--r-- | pkgs/games/instead/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index b25341da01d..fff15b5c5b0 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -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/; |