tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
instead: 3.3.0 -> 3.3.1
Orivej Desh
6 years ago
5bd1bd08
a1eee824
+9
-11
2 changed files
expand all
collapse all
unified
split
pkgs
games
instead
default.nix
top-level
all-packages.nix
+8
-8
pkgs/games/instead/default.nix
···
1
1
-
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
1
1
+
{ stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }:
2
2
3
3
let
4
4
-
version = "3.3.0";
4
4
+
version = "3.3.1";
5
5
6
6
# I took several games at random from http://instead.syscall.ru/games/
7
7
games = [
···
33
33
34
34
src = fetchurl {
35
35
url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
36
36
-
sha256 = "0kskwrq2gy1gpp97134sjrw08ip1h6i5dc64zrbl9yv7jaz4by69";
36
36
+
sha256 = "10bppcdjnd0all71l5akdvy7fx0c8s8x0za9qxszs8cjmlv9z1q0";
37
37
};
38
38
39
39
NIX_LDFLAGS = "-llua -lgcc_s";
40
40
41
41
-
nativeBuildInputs = [ pkgconfig ];
42
42
-
buildInputs = [ SDL SDL_ttf SDL_image SDL_mixer lua zlib unzip ];
41
41
+
nativeBuildInputs = [ pkgconfig unzip ];
42
42
+
buildInputs = [ SDL2 SDL2_ttf SDL2_image SDL2_mixer lua zlib ];
43
43
44
44
configurePhase = ''
45
45
{ echo 2; echo $out; } | ./configure.sh
···
47
47
48
48
inherit games;
49
49
50
50
-
installPhase = ''
51
51
-
make install
52
52
-
50
50
+
postInstall = ''
53
51
pushd $out/share/instead/games
54
52
for a in $games; do
55
53
unzip $a
56
54
done
57
55
popd
58
56
'';
57
57
+
58
58
+
enableParallelBuilding = true;
59
59
60
60
meta = with stdenv.lib; {
61
61
description = "Simple text adventure interpreter for Unix and Windows";
+1
-3
pkgs/top-level/all-packages.nix
···
22841
22841
22842
22842
ideogram = callPackage ../applications/graphics/ideogram { };
22843
22843
22844
22844
-
instead = callPackage ../games/instead {
22845
22845
-
lua = lua5;
22846
22846
-
};
22844
22844
+
instead = callPackage ../games/instead { };
22847
22845
22848
22846
instead-launcher = callPackage ../games/instead-launcher { };
22849
22847