git.iko.soy/typeable/nixpkgs
on master help sign in
instead: 3.3.0 -> 3.3.1
commit5bd1bd08ed4e7bc10a5d426b9b02e212e9a08f8b authorOrivej Desh <orivej@gmx.fr> dateSun 8 Dec 2019, 23:35 (7 years ago) parenta1eee82
2 files changed+9−11
pkgs/games/instead/default.nix+8−8 pkgs/top-level/all-packages.nix+1−3
pkgs/games/instead/default.nix+8−8
@@ -1,7 +1,7 @@
1−{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
1+{ stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }:
22
33let
4− version = "3.3.0";
4+ version = "3.3.1";
55
66 # I took several games at random from http://instead.syscall.ru/games/
77 games = [
@@ -33,13 +33,13 @@ stdenv.mkDerivation {
3333
3434 src = fetchurl {
3535 url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
36− sha256 = "0kskwrq2gy1gpp97134sjrw08ip1h6i5dc64zrbl9yv7jaz4by69";
36+ sha256 = "10bppcdjnd0all71l5akdvy7fx0c8s8x0za9qxszs8cjmlv9z1q0";
3737 };
3838
3939 NIX_LDFLAGS = "-llua -lgcc_s";
4040
41− nativeBuildInputs = [ pkgconfig ];
42− buildInputs = [ SDL SDL_ttf SDL_image SDL_mixer lua zlib unzip ];
41+ nativeBuildInputs = [ pkgconfig unzip ];
42+ buildInputs = [ SDL2 SDL2_ttf SDL2_image SDL2_mixer lua zlib ];
4343
4444 configurePhase = ''
4545 { echo 2; echo $out; } | ./configure.sh
@@ -47,9 +47,7 @@ stdenv.mkDerivation {
4747
4848 inherit games;
4949
50− installPhase = ''
51− make install
52−
50+ postInstall = ''
5351 pushd $out/share/instead/games
5452 for a in $games; do
5553 unzip $a
@@ -57,6 +55,8 @@ stdenv.mkDerivation {
5755 popd
5856 '';
5957
58+ enableParallelBuilding = true;
59+
6060 meta = with stdenv.lib; {
6161 description = "Simple text adventure interpreter for Unix and Windows";
6262 homepage = http://instead.syscall.ru/;
pkgs/top-level/all-packages.nix+1−3
@@ -22841,9 +22841,7 @@ in
2284122841
2284222842 ideogram = callPackage ../applications/graphics/ideogram { };
2284322843
22844− instead = callPackage ../games/instead {
22845− lua = lua5;
22846− };
22844+ instead = callPackage ../games/instead { };
2284722845
2284822846 instead-launcher = callPackage ../games/instead-launcher { };
2284922847