public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nethack: 3.6.1 -> 3.6.2

Browse Source 
Notes:
  - libXpm added as a new dependency for nethack-x11.
  - moc path fixed for nethack-qt.
This commit is contained in:
Chris Rendle-Short 2019-05-10 11:44:18 +10:00
parent 0c510db2d7
commit 926490c862
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/games/nethack/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison { stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison
, less, makeWrapper , less, makeWrapper
, buildPackages , buildPackages
, x11Mode ? false, qtMode ? false, libXaw, libXext, bdftopcf, mkfontdir, pkgconfig, qt5 , x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkgconfig, qt5
}: }:
let let
@ -19,18 +19,18 @@ let
binPath = lib.makeBinPath [ coreutils less ]; binPath = lib.makeBinPath [ coreutils less ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "3.6.1"; version = "3.6.2";
name = if x11Mode then "nethack-x11-${version}" name = if x11Mode then "nethack-x11-${version}"
else if qtMode then "nethack-qt-${version}" else if qtMode then "nethack-qt-${version}"
else "nethack-${version}"; else "nethack-${version}";
src = fetchurl { src = fetchurl {
url = "https://nethack.org/download/3.6.1/nethack-361-src.tgz"; url = "https://nethack.org/download/3.6.2/nethack-362-src.tgz";
sha256 = "1dha0ijvxhx7c9hr0452h93x81iiqsll8bc9msdnp7xdqcfbz32b"; sha256 = "07fvkm3v11a4pjrq2f66vjslljsvk6raal53skn4gqsfdbd0ml7v";
}; };
buildInputs = [ ncurses ] buildInputs = [ ncurses ]
++ lib.optionals x11Mode [ libXaw libXext ] ++ lib.optionals x11Mode [ libXaw libXext libXpm ]
++ lib.optionals qtMode [ gzip qt5.qtbase.bin qt5.qtmultimedia.bin ]; ++ lib.optionals qtMode [ gzip qt5.qtbase.bin qt5.qtmultimedia.bin ];
nativeBuildInputs = [ flex bison ] nativeBuildInputs = [ flex bison ]
@ -72,6 +72,7 @@ in stdenv.mkDerivation rec {
-e 's,CFLAGS.*QtGui.*,CFLAGS += `pkg-config Qt5Gui --cflags`,' \ -e 's,CFLAGS.*QtGui.*,CFLAGS += `pkg-config Qt5Gui --cflags`,' \
-e 's,CFLAGS+=-DCOMPRESS.*,CFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\ -e 's,CFLAGS+=-DCOMPRESS.*,CFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\
-DCOMPRESS_EXTENSION=\\".gz\\",' \ -DCOMPRESS_EXTENSION=\\".gz\\",' \
-e 's,moc-qt4,moc,' \
-i sys/unix/hints/linux-qt4 -i sys/unix/hints/linux-qt4
''} ''}
${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform)