diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/bugdom/default.nix | 44 | ||||
-rw-r--r-- | pkgs/games/cataclysm-dda/common.nix | 2 | ||||
-rw-r--r-- | pkgs/games/nethack/default.nix | 11 | ||||
-rw-r--r-- | pkgs/games/openmw/default.nix | 5 | ||||
-rw-r--r-- | pkgs/games/steam/fhsenv.nix | 8 |
5 files changed, 61 insertions, 9 deletions
diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix new file mode 100644 index 0000000000000..57a1e41409023 --- /dev/null +++ b/pkgs/games/bugdom/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub, SDL2, cmake, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "bugdom"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "jorio"; + repo = pname; + rev = version; + sha256 = "sha256:1371inw11rzfrxmc3v4gv5axp56bxjbcr0mhqm4x839401bfq5mf"; + fetchSubmodules = true; + }; + + buildInputs = [ + SDL2 + ]; + + nativeBuildInputs = [ + cmake + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/bugdom + mv Data $out/share/bugdom + install -Dm755 {.,$out/bin}/Bugdom + wrapProgram $out/bin/Bugdom --run "cd $out/share/bugdom" + + runHook postInstall + ''; + + meta = with lib; { + description = "A port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems"; + homepage = "https://github.com/jorio/Bugdom"; + license = with licenses; [ + cc-by-sa-40 + ]; + maintainers = with maintainers; [ lux ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 1701d84e8df7a..af20169a6e088 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { ''; makeFlags = [ - "PREFIX=$(out)" "LANGUAGES=all" + "PREFIX=$(out)" "LANGUAGES=all" "RUNTESTS=0" (if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1") ] ++ optionals (!debug) [ "RELEASE=1" diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 2b29bddad93ca..f6de3d57c1304 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison +{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison, fetchpatch , less , buildPackages , x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5 @@ -24,6 +24,15 @@ in stdenv.mkDerivation rec { else if qtMode then "nethack-qt" else "nethack"; + patches = [ + # Don't unset `__warn_unused_result__`, breaks on glibc-2.34 + (fetchpatch { + url = "https://github.com/NetHack/NetHack/commit/81d73ce417dda6a98e2e918e06922e68b67c53f7.patch"; + sha256 = "sha256-PX9XtJTEE3K1yg/IwIzEIT+EZWi02gU+9msrsG9ZWQY="; + revert = true; + }) + ]; + src = fetchurl { url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz"; sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng"; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index edc8147a2b77b..8746d3172ac83 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -83,5 +83,10 @@ mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar marius851000 ]; platforms = platforms.linux; + + # 2021-10-13, doesn't compile with glibc-2.34, maintainers prefer a fix on glibc's end. + # Can be marked as un-broken as soon as https://gitlab.com/OpenMW/openmw/-/merge_requests/1239 + # is resolved and a patch is appliable here. + broken = true; }; } diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index c5fba68b22a10..d18accd0d546a 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -206,12 +206,6 @@ in buildFHSUserEnv rec { ++ steamPackages.steam-runtime-wrapped.overridePkgs ++ extraLibraries pkgs; - extraBuildCommands = '' - ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0 - '' + lib.optionalString (steam-runtime-wrapped-i686 != null) '' - ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0 - ''; - extraInstallCommands = '' mkdir -p $out/share/applications ln -s ${steam}/share/icons $out/share @@ -269,7 +263,7 @@ in buildFHSUserEnv rec { name = "steam-run"; targetPkgs = commonTargetPkgs; - inherit multiPkgs extraBuildCommands profile extraInstallCommands; + inherit multiPkgs profile extraInstallCommands; inherit unshareIpc unsharePid; |