Skip to content

Commit f82827e

Browse files
authored
Fix failing tonlib compilation on ubuntu with nixpkgs (#1309)
* force gcc-11+ * install gcc-11+ * fix missing gcc-11 in nix build on ubuntu * cleanup
1 parent 66e81f5 commit f82827e

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

assembly/native/build-macos-portable.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ else
2424
fi
2525

2626
export NONINTERACTIVE=1
27-
brew install ninja pkg-config automake libtool autoconf
27+
brew install ninja pkg-config automake libtool autoconf texinfo
2828
brew install llvm@16
2929

3030

assembly/nix/linux-arm64-tonlib.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,13 @@ pkgs.llvmPackages_16.stdenv.mkDerivation {
4242
];
4343

4444
dontAddStaticConfigureFlags = false;
45+
doCheck = false;
46+
doInstallCheck = false;
4547

4648
cmakeFlags = [
47-
"-DTON_USE_ABSEIL=OFF"
49+
"-DTON_USE_ABSEIL=ON"
4850
"-DNIX=ON"
51+
"-DTON_ONLY_TONLIB=ON"
4952
];
5053

5154
LDFLAGS = [

assembly/nix/linux-x86-64-tonlib.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,13 @@ stdenv227.mkDerivation {
5858
];
5959

6060
dontAddStaticConfigureFlags = false;
61+
doCheck = false;
62+
doInstallCheck = false;
6163

6264
cmakeFlags = [
6365
"-DTON_USE_ABSEIL=ON"
6466
"-DNIX=ON"
67+
"-DTON_ONLY_TONLIB=ON"
6568
];
6669

6770
LDFLAGS = [

0 commit comments

Comments
 (0)