nethack-qt: fix build w/glibc-2.34

Failing Hydra build: https://hydra.nixos.org/build/156236800
main
Maximilian Bosch 3 years ago
parent fe58c181d3
commit 6b98a5e512
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
  1. 11
      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";

Loading…
Cancel
Save