diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-01 00:14:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 00:14:10 +0000 |
| commit | a1ed79952d0edc51a55931a28fba93fca0cf00fd (patch) | |
| tree | f3b3ffecba4907d35227c8d32bf20115a208817b /pkgs/games | |
| parent | 47e7b83fd1c8d5fdacf6a5a7a56a93b578a3e973 (diff) | |
| parent | a6a84940248f7ea903c9dfffbb777c558b6cfe3d (diff) | |
| download | nixlib-a1ed79952d0edc51a55931a28fba93fca0cf00fd.tar nixlib-a1ed79952d0edc51a55931a28fba93fca0cf00fd.tar.gz nixlib-a1ed79952d0edc51a55931a28fba93fca0cf00fd.tar.bz2 nixlib-a1ed79952d0edc51a55931a28fba93fca0cf00fd.tar.lz nixlib-a1ed79952d0edc51a55931a28fba93fca0cf00fd.tar.xz nixlib-a1ed79952d0edc51a55931a28fba93fca0cf00fd.tar.zst nixlib-a1ed79952d0edc51a55931a28fba93fca0cf00fd.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/openmw/tes3mp.nix | 5 | ||||
| -rw-r--r-- | pkgs/games/unnethack/default.nix | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 915c006f9137..318c28aff922 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -7,14 +7,13 @@ , luajit , makeWrapper , symlinkJoin -, disable-warnings-if-gcc13 }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy let # raknet could also be split into dev and lib outputs - raknet = disable-warnings-if-gcc13 (stdenv.mkDerivation { + raknet = stdenv.mkDerivation { pname = "raknet"; version = "unstable-2020-01-19"; @@ -46,7 +45,7 @@ let installPhase = '' install -Dm555 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a ''; - }); + }; coreScripts = stdenv.mkDerivation { pname = "corescripts"; diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index af402a7de935..f328b8c01eed 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { }) ]; + # Fails at startup due to off-by-one: + # https://github.com/NixOS/nixpkgs/issues/292113#issuecomment-1969989058 + # TODO: drop it once 6.x branch releases. + hardeningDisable = [ "fortify3" ]; + # Fails the build occasionally due to missing buid depends: # ./../sys/unix/unixmain.c:9:10: fatal error: date.h: No such file or directory # TODO: remove once upstream issue is fixed: |