git.iko.soy/typeable/nixpkgs
on master help sign in
nethack: 3.6.1 -> 3.6.2

Notes: - libXpm added as a new dependency for nethack-x11. - moc path fixed for nethack-qt.

commit926490c86247f27aff1d54bfbf26d2e22a89d2c0 authorChris Rendle-Short <chris@killred.net> dateFri 10 May 2019, 11:44 (8 years ago) parent0c510db
1 file changed+6−5
pkgs/games/nethack/default.nix+6−5
pkgs/games/nethack/default.nix+6−5
@@ -1,7 +1,7 @@
11{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison
22, less, makeWrapper
33, buildPackages
4−, x11Mode ? false, qtMode ? false, libXaw, libXext, bdftopcf, mkfontdir, pkgconfig, qt5
4+, x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkgconfig, qt5
55}:
66
77let
@@ -19,18 +19,18 @@ let
1919 binPath = lib.makeBinPath [ coreutils less ];
2020
2121in stdenv.mkDerivation rec {
22− version = "3.6.1";
22+ version = "3.6.2";
2323 name = if x11Mode then "nethack-x11-${version}"
2424 else if qtMode then "nethack-qt-${version}"
2525 else "nethack-${version}";
2626
2727 src = fetchurl {
28− url = "https://nethack.org/download/3.6.1/nethack-361-src.tgz";
29− sha256 = "1dha0ijvxhx7c9hr0452h93x81iiqsll8bc9msdnp7xdqcfbz32b";
28+ url = "https://nethack.org/download/3.6.2/nethack-362-src.tgz";
29+ sha256 = "07fvkm3v11a4pjrq2f66vjslljsvk6raal53skn4gqsfdbd0ml7v";
3030 };
3131
3232 buildInputs = [ ncurses ]
33− ++ lib.optionals x11Mode [ libXaw libXext ]
33+ ++ lib.optionals x11Mode [ libXaw libXext libXpm ]
3434 ++ lib.optionals qtMode [ gzip qt5.qtbase.bin qt5.qtmultimedia.bin ];
3535
3636 nativeBuildInputs = [ flex bison ]
@@ -72,6 +72,7 @@ in stdenv.mkDerivation rec {
7272 -e 's,CFLAGS.*QtGui.*,CFLAGS += `pkg-config Qt5Gui --cflags`,' \
7373 -e 's,CFLAGS+=-DCOMPRESS.*,CFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\
7474 -DCOMPRESS_EXTENSION=\\".gz\\",' \
75+ -e 's,moc-qt4,moc,' \
7576 -i sys/unix/hints/linux-qt4
7677 ''}
7778 ${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform)