diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/dwarf-fortress/wrapper/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/mar1d/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/nethack/default.nix | 41 | ||||
-rw-r--r-- | pkgs/games/openrw/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/simutrans/default.nix | 1 |
5 files changed, 39 insertions, 13 deletions
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 5eebbf77d2ba..6efe004fa9e8 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -22,8 +22,6 @@ let then builtins.getAttr theme themes else theme; - twbtOnlyWithDFHack = assert (enableDFHack || !enableTWBT); true; - unBool = b: if b then "YES" else "NO"; # These are in inverse order for first packages to override the next ones. diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index dce52d4c2957..da711f59af02 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , libGLU -, x11 +, xlibsWrapper , xorg , xinput_calibrator , doxygen @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libao libpthreadstubs libGLU - x11 + xlibsWrapper xinput_calibrator xorg.libXrandr xorg.libXi diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index eed38592236f..db959177eb57 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison, less -, x11Mode ? false, libXaw, libXext, mkfontdir +{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison +, less, makeWrapper +, x11Mode ? false, qtMode ? false, libXaw, libXext, mkfontdir, pkgconfig, qt5 }: let @@ -8,6 +9,7 @@ let else throw "Unknown platform for NetHack: ${stdenv.system}"; unixHint = if x11Mode then "linux-x11" + else if qtMode then "linux-qt4" else if stdenv.hostPlatform.isLinux then "linux" else if stdenv.hostPlatform.isDarwin then "macosx10.10" # We probably want something different for Darwin @@ -15,17 +17,27 @@ let userDir = "~/.config/nethack"; binPath = lib.makeBinPath [ coreutils less ]; -in stdenv.mkDerivation { - name = "nethack${lib.optionalString x11Mode "-x11"}-3.6.1"; +in stdenv.mkDerivation rec { + version = "3.6.1"; + name = if x11Mode then "nethack-x11-${version}" + else if qtMode then "nethack-qt-${version}" + else "nethack-${version}"; src = fetchurl { url = "https://nethack.org/download/3.6.1/nethack-361-src.tgz"; sha256 = "1dha0ijvxhx7c9hr0452h93x81iiqsll8bc9msdnp7xdqcfbz32b"; }; - buildInputs = [ ncurses ] ++ lib.optionals x11Mode [ libXaw libXext ]; + buildInputs = [ ncurses ] + ++ lib.optionals x11Mode [ libXaw libXext ] + ++ lib.optionals qtMode [ gzip qt5.qtbase.bin qt5.qtmultimedia.bin ]; - nativeBuildInputs = [ flex bison ] ++ lib.optionals x11Mode [ mkfontdir ]; + nativeBuildInputs = [ flex bison ] + ++ lib.optionals x11Mode [ mkfontdir ] + ++ lib.optionals qtMode [ + pkgconfig mkfontdir qt5.qtbase.dev + qt5.qtmultimedia.dev makeWrapper + ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -36,6 +48,11 @@ in stdenv.mkDerivation { -e 's/^LEX *=.*/LEX = flex/' \ -i sys/unix/Makefile.utl sed \ + -e 's,^WINQT4LIB =.*,WINQT4LIB = `pkg-config Qt5Gui --libs` \\\ + `pkg-config Qt5Widgets --libs` \\\ + `pkg-config Qt5Multimedia --libs`,' \ + -i sys/unix/Makefile.src + sed \ -e 's,/bin/gzip,${gzip}/bin/gzip,g' \ -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ -i sys/unix/hints/linux @@ -45,6 +62,12 @@ in stdenv.mkDerivation { -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \ -i sys/unix/hints/macosx10.10 sed -e '/define CHDIR/d' -i include/config.h + sed \ + -e 's,^QTDIR *=.*,QTDIR=${qt5.qtbase.dev},' \ + -e 's,CFLAGS.*QtGui.*,CFLAGS += `pkg-config Qt5Gui --cflags`,' \ + -e 's,CFLAGS+=-DCOMPRESS.*,CFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\ + -DCOMPRESS_EXTENSION=\\".gz\\",' \ + -i sys/unix/hints/linux-qt4 ''; configurePhase = '' @@ -90,6 +113,12 @@ in stdenv.mkDerivation { EOF chmod +x $out/bin/nethack ${lib.optionalString x11Mode "mv $out/bin/nethack $out/bin/nethack-x11"} + ${lib.optionalString qtMode "mv $out/bin/nethack $out/bin/nethack-qt"} + ''; + + postFixup = lib.optionalString qtMode '' + wrapProgram $out/bin/nethack-qt \ + --prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" ''; meta = with stdenv.lib; { diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 5a8a8d244bf6..63fb24dc4d7d 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, x11, openal +{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal , SDL2, boost, ffmpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake sfml libGLU_combined bullet glm libmad x11 openal SDL2 boost ffmpeg + cmake sfml libGLU_combined bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg ]; meta = with stdenv.lib; { diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index ada2520a097c..ccece066cdc2 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -16,7 +16,6 @@ let ver3 = "2"; version = "${ver1}.${ver2}.${ver3}"; ver_dash = "${ver1}-${ver2}-${ver3}"; - ver2_dash = "${ver1}-${ver2}"; binary_src = fetchurl { url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip"; |