From c49ea247e764443de1c521bcc4571bd69fde86d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 27 Jan 2026 13:24:38 +0100 Subject: [PATCH] nix: put library files into lib directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also drop unnecessary patch of build_rln.sh Signed-off-by: Jakub SokoĊ‚owski --- nix/default.nix | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index b8ca87f94..d3e1985b5 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -59,20 +59,6 @@ in stdenv.mkDerivation { "LIBRLN_FILE=${zerokitRln}/lib/librln.${if abidir != null then "so" else "a"}" ]; - postPatch = '' - cat > scripts/build_rln.sh << 'EOF' - #!/usr/bin/env bash - set -e - build_dir=$1 - rln_version=$2 - output_filename=$3 - # Just copy the library we already have - cp ${zerokitRln}/lib/librln.a "$output_filename" 2>/dev/null || \ - cp ${zerokitRln}/target/release/librln.a "$output_filename" - EOF - chmod +x scripts/build_rln.sh - ''; - configurePhase = '' patchShebangs . vendor/nimbus-build-system > /dev/null make nimbus-build-system-paths @@ -105,13 +91,10 @@ in stdenv.mkDerivation { echo '${androidManifest}' > $out/jni/AndroidManifest.xml cd $out && zip -r libwaku.aar * '' else '' - mkdir -p $out/bin $out/include - - # Copy library files - cp build/* $out/bin/ 2>/dev/null || true - - # Copy the header file - cp library/libwaku.h $out/include/ + mkdir -p $out/bin $out/lib $out/include + cp build/waku* $out/bin || true + cp build/lib* $out/lib || true + cp library/libwaku.h $out/include # Copy Nim's nimbase.h (required by libwaku.h) cp vendor/nimbus-build-system/vendor/Nim/lib/nimbase.h $out/include/