Skip to content

Commit 5d77809

Browse files
committed
openttd: fix build against icu-76
Without the change `openttd` build fails in `master` as https://hydra.nixos.org/build/290760688: [100%] Linking CXX executable openttd ld: CMakeFiles/openttd_lib.dir/src/survey.cpp.o: undefined reference to symbol 'u_versionToString_76' ld: /nix/store/...-icu4c-76.1/lib/libicuuc.so.76: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status
1 parent 7395957 commit 5d77809

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

pkgs/games/openttd/default.nix

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
fetchzip,
5+
fetchpatch,
56
cmake,
67
pkg-config,
78
SDL2,
@@ -71,6 +72,16 @@ stdenv.mkDerivation rec {
7172
hash = "sha256-YT4IE/rJ9pnpeMWKbOra6AbSUwW19RwOKlXkxwoMeKY=";
7273
};
7374

75+
patches = [
76+
# Fix build against icu-76:
77+
# https://github.com/OpenTTD/OpenTTD/pull/13048
78+
(fetchpatch {
79+
name = "icu-75.patch";
80+
url = "https://github.com/OpenTTD/OpenTTD/commit/14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e.patch";
81+
hash = "sha256-L35ybnTKPO+HVP/7ZYzWM2mA+s1RAywhofSuzpy/6sc=";
82+
})
83+
];
84+
7485
nativeBuildInputs = [
7586
cmake
7687
pkg-config

pkgs/games/openttd/jgrpp.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ openttd.overrideAttrs (oldAttrs: rec {
1010
rev = "jgrpp-${version}";
1111
hash = "sha256-aEmuwWNxqjuLmiWMrqwTUtCwdwDMA00eQspCHntxEXw=";
1212
};
13+
patches = [];
1314

1415
buildInputs = oldAttrs.buildInputs ++ [ zstd ];
1516

0 commit comments

Comments
 (0)