diff options
| author | Jonathan Ringer <jonringer@users.noreply.github.com> | 2022-02-27 18:07:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-27 18:07:11 -0800 |
| commit | 3af9faf36da03c612daa1c3ed12a9df1201e77f6 (patch) | |
| tree | f222a716d9e0ca054dcd63bad446447391515b59 /pkgs/games | |
| parent | b83b3490495f0a086597416e0766b6d5729e3c54 (diff) | |
| parent | 82580b15188e994aff429220d1634b3fc6ad357f (diff) | |
Merge pull request #133431 from Ma27/glibc-2.34
glibc: 2.33-108 -> 2.34-115
Diffstat (limited to 'pkgs/games')
| -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 |
3 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 1701d84e8df7..af20169a6e08 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 2b29bddad93c..f6de3d57c130 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 edc8147a2b77..8746d3172ac8 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; }; } |