Skip to content

Commit 6771258

Browse files
committed
frotz: 2.44 -> 2.52
As a bonus, this new derivation also adds unicode support, which the current nixpkgs build lacks.
1 parent 9fbbe30 commit 6771258

1 file changed

Lines changed: 24 additions & 9 deletions

File tree

pkgs/games/frotz/default.nix

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,40 @@
1-
{ stdenv, fetchFromGitHub, ncurses }:
1+
{ fetchFromGitLab
2+
, libao
3+
, libmodplug
4+
, libsamplerate
5+
, libsndfile
6+
, libvorbis
7+
, ncurses
8+
, stdenv }:
29

310
stdenv.mkDerivation rec {
4-
version = "2.44";
11+
version = "2.52";
512
pname = "frotz";
613

7-
src = fetchFromGitHub {
14+
src = fetchFromGitLab {
15+
domain = "gitlab.com";
816
owner = "DavidGriffith";
917
repo = "frotz";
1018
rev = version;
11-
sha256 = "0gjkk4gxzqmxfdirrz2lr0bms6l9fc31vkmlywigkbdlh8wxgypp";
19+
sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y";
1220
};
1321

14-
makeFlags = [ "CC=cc" "PREFIX=$(out)" "CURSES=-lncurses" ];
15-
16-
buildInputs = [ ncurses ];
22+
buildInputs = [ libao libmodplug libsamplerate libsndfile libvorbis ncurses ];
23+
preBuild = ''
24+
makeFlagsArray+=(
25+
CC="cc"
26+
CFLAGS="-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600"
27+
LDFLAGS="-lncursesw -ltinfo"
28+
)
29+
'';
30+
installFlags = [ "PREFIX=$(out)" ];
1731

1832
meta = with stdenv.lib; {
19-
homepage = "http://frotz.sourceforge.net/";
33+
homepage = "https://davidgriffith.gitlab.io/frotz/";
34+
changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS";
2035
description = "A z-machine interpreter for Infocom games and other interactive fiction.";
2136
platforms = platforms.unix;
22-
maintainers = [ maintainers.nicknovitski ];
37+
maintainers = with maintainers; [ nicknovitski ddelabru ];
2338
license = licenses.gpl2;
2439
};
2540
}

0 commit comments

Comments
 (0)