From 0e6207fb44b3a5796bf0ff0e1c31944ee935e062 Mon Sep 17 00:00:00 2001 From: Priec Date: Fri, 14 Aug 2026 18:10:46 +0200 Subject: [PATCH] musl linux compilation working from now on --- .env_template_musl | 11 +++++++++++ .gitignore | 1 + client | 2 +- packaging/musl/README.md | 2 +- packaging/musl/default.nix | 7 ++++++- server | 2 +- 6 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 .env_template_musl diff --git a/.env_template_musl b/.env_template_musl new file mode 100644 index 00000000..3ac0ae8e --- /dev/null +++ b/.env_template_musl @@ -0,0 +1,11 @@ +JWT_SECRET= +RUST_DB_MODE=embedded +KOMP_AC_POSTGRES_DIR=./data/postgresql +RUST_DB_NAME=komp_ac +RUST_DB_USER=postgres +RUST_DB_PASSWORD= +RUST_DB_HOST=127.0.0.1 +RUST_DB_PORT=5433 +RUST_DB_MAX_CONNECTIONS=5 +GRPC_LISTEN_ADDRESS=[::1]:50051 +PG_DUMP_DIR=./data/dumps diff --git a/.gitignore b/.gitignore index 5a45962c..89f041d5 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ AGENT_TESTING_NOTES.md AGENT_TESTING_NOTES_CLIENT.md AGENT_TESTING_NOTES_WEB.md run_bins/ +result diff --git a/client b/client index e7ae5a9f..be0c5526 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit e7ae5a9ff65f91fb581c3477121d09eb5dbaceae +Subproject commit be0c55263882d27a3f428268d695fcbf328161cf diff --git a/packaging/musl/README.md b/packaging/musl/README.md index c1ec2664..06adad98 100644 --- a/packaging/musl/README.md +++ b/packaging/musl/README.md @@ -21,7 +21,7 @@ Output: `result/bin/server`. The resulting executable is intended for 64-bit Linux kernels. Run it normally: ```sh -cp .env_template .env +cp .env_template_musl .env # Replace JWT_SECRET in .env before starting. ./result/bin/server server ``` diff --git a/packaging/musl/default.nix b/packaging/musl/default.nix index 4938af1b..49c79f7c 100644 --- a/packaging/musl/default.nix +++ b/packaging/musl/default.nix @@ -157,9 +157,14 @@ bootstrapRustPlatform.buildRustPackage { SQLX_OFFLINE = "true"; RUSTFLAGS = "-Ctarget-feature=+crt-static"; + preBuild = '' + cp -r ${source}/.sqlx .sqlx + ''; + postInstall = '' - file "$out/bin/server" | grep -q 'statically linked' + test -x "$out/bin/server" ! readelf -l "$out/bin/server" | grep -q 'Requesting program interpreter' + ! readelf -d "$out/bin/server" | grep -q '(NEEDED)' ''; meta = { diff --git a/server b/server index f075e3a1..f8371df8 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit f075e3a1f4424a5dd187315f7a7373062aaf17e9 +Subproject commit f8371df81f6159eb831c937bac64504f1ff47811