mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
nethack-qt: fix build w/glibc-2.34
Failing Hydra build: https://hydra.nixos.org/build/156236800
This commit is contained in:
parent
fe58c181d3
commit
6b98a5e512
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison
|
{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison, fetchpatch
|
||||||
, less
|
, less
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5
|
, 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 if qtMode then "nethack-qt"
|
||||||
else "nethack";
|
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 {
|
src = fetchurl {
|
||||||
url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz";
|
url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz";
|
||||||
sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng";
|
sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng";
|
||||||
|
Loading…
Reference in New Issue
Block a user