diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-21 00:18:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-21 00:18:17 +0000 |
| commit | 31b235f73ba110620ff75a1f2747bffac2dcc5d5 (patch) | |
| tree | 5086dcbc896aa27402414f5703e99d0a81e3b4cc /pkgs/games | |
| parent | e678b769bc88738c70db57befba5c08075e391d3 (diff) | |
| parent | fec59592b9c262184057e31646bdf0956135cdc5 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/freedroidrpg/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/games/freedroidrpg/drop-build-deps.patch | 15 | ||||
| -rw-r--r-- | pkgs/games/hyperrogue/default.nix | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index 84fd9c154a24a..dcec52a3fa6d5 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -18,6 +18,9 @@ in stdenv.mkDerivation { url = "https://gitlab.com/freedroid/freedroid-src/-/commit/e610d427374226b79da5258d979936459f30c761.patch"; sha256 = "1s7sw4dkc7b6i72j6x47driq6v0k3wss48l9ivd4fw40n3iaxjb1"; }) + + # Do not embed build flags in the binary to reduce closure size. + ./drop-build-deps.patch ]; nativeBuildInputs = [ pkg-config gettext python3 ]; diff --git a/pkgs/games/freedroidrpg/drop-build-deps.patch b/pkgs/games/freedroidrpg/drop-build-deps.patch new file mode 100644 index 0000000000000..d9f2d37b57c7c --- /dev/null +++ b/pkgs/games/freedroidrpg/drop-build-deps.patch @@ -0,0 +1,15 @@ +Do not embed paths to build-only depends (-I...SDL2-dev and friends) +into savefile lua comments. +--- a/src/savestruct_internal.c ++++ b/src/savestruct_internal.c +@@ -486,8 +486,8 @@ void save_game_data(struct auto_string *strout) + autostr_append(strout, + "SAVEGAME: %s %s %s;sizeof(tux_t)=%d;sizeof(enemy)=%d;sizeof(bullet)=%d;MAXBULLETS=%d\n", + SAVEGAME_VERSION, SAVEGAME_REVISION, VERSION, (int)sizeof(tux_t), (int)sizeof(enemy), (int)sizeof(bullet), (int)MAXBULLETS); +- autostr_append(strout, "BUILD_CFLAGS: %s\n", BUILD_CFLAGS); +- autostr_append(strout, "BUILD_LDFLAGS: %s\n", BUILD_LDFLAGS); ++ autostr_append(strout, "BUILD_CFLAGS: %s\n", "<hidden>"); ++ autostr_append(strout, "BUILD_LDFLAGS: %s\n", "<hidden>"); + autostr_append(strout, "VERSION: %s\n", freedroid_version); + autostr_append(strout, "--]]\n"); + diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 9fe1148be3caa..2370b008225b9 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.0u"; + version = "12.1a"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-zG8Z+wpwr5z2r2CcjNxKOdiqXUN0AFChZcihUWel68A="; + sha256 = "sha256-VmWZkIjDy/yv0g9YCW9x8b0LE5guHIA/KZc3OXJoCdA="; }; CXXFLAGS = [ |