fix(freebuff): patch pre-built binary with patchelf for NixOS compatibility
- Download and extract the engine binary from codebuff.com releases - Use patchelf to set correct glibc interpreter path - Create wrapper launcher that copies patched binary to user config - Pre-fetch all npm dependencies (no network needed in sandbox) - Set dontStrip/dontPatchelf to prevent fixupPhase corruption
This commit is contained in:
@@ -1 +1 @@
|
|||||||
{ pkgs, ... }: pkgs.callPackage ./package.nix { }
|
{ pkgs, ... }: pkgs.callPackage ./package.nix { glibc = pkgs.stdenv.cc.libc; }
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
fetchurl,
|
fetchurl,
|
||||||
nodejs,
|
nodejs,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
|
patchelf,
|
||||||
|
glibc,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@@ -44,6 +46,12 @@ let
|
|||||||
hash = "sha256-fJ1D26t8qzsxM7Dmpa8UAUSCKFMWs57J9QjvrdnrzpU=";
|
hash = "sha256-fJ1D26t8qzsxM7Dmpa8UAUSCKFMWs57J9QjvrdnrzpU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Pre-built binary release from codebuff.com
|
||||||
|
binarySrc = fetchurl {
|
||||||
|
url = "https://codebuff.com/api/releases/download/${version}/freebuff-linux-x64.tar.gz";
|
||||||
|
hash = "sha256-WRTEXqKDww4ZPAnDLAAkAd0jxl+z6+dRbcQORmN7QfM=";
|
||||||
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@@ -52,11 +60,34 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = freebuffSrc;
|
src = freebuffSrc;
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper patchelf ];
|
||||||
|
|
||||||
|
dontStrip = true;
|
||||||
|
dontPatchelf = true;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
|
# Extract and patch the pre-built binary for NixOS compatibility
|
||||||
|
mkdir -p "$out/bin" /tmp/fb-engine
|
||||||
|
tar xzf "${binarySrc}" -C /tmp/fb-engine --strip-components=0
|
||||||
|
cp /tmp/fb-engine/freebuff "$out/bin/freebuff-engine"
|
||||||
|
chmod 755 "$out/bin/freebuff-engine"
|
||||||
|
|
||||||
|
# Patch ELF interpreter and rpath for glibc on NixOS
|
||||||
|
patchelf \
|
||||||
|
--set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" \
|
||||||
|
--set-rpath "${glibc}/lib:" \
|
||||||
|
"$out/bin/freebuff-engine"
|
||||||
|
|
||||||
|
# Copy tree-sitter.wasm next to the engine binary
|
||||||
|
if [ -f /tmp/fb-engine/tree-sitter.wasm ]; then
|
||||||
|
cp /tmp/fb-engine/tree-sitter.wasm "$out/bin/"
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -rf /tmp/fb-engine
|
||||||
|
|
||||||
|
# Set up JS launcher and npm dependencies
|
||||||
mkdir -p "$out/lib/node_modules/freebuff"
|
mkdir -p "$out/lib/node_modules/freebuff"
|
||||||
cp -r * "$out/lib/node_modules/freebuff/"
|
cp -r * "$out/lib/node_modules/freebuff/"
|
||||||
|
|
||||||
@@ -75,10 +106,86 @@ stdenv.mkDerivation rec {
|
|||||||
mkdir -p "$out/lib/node_modules/@isaacs"
|
mkdir -p "$out/lib/node_modules/@isaacs"
|
||||||
extractNpmPkg "${pkgFsMinipass}" "$out/lib/node_modules/@isaacs/fs-minipass"
|
extractNpmPkg "${pkgFsMinipass}" "$out/lib/node_modules/@isaacs/fs-minipass"
|
||||||
|
|
||||||
mkdir -p "$out/bin"
|
# Create wrapper launcher that uses the pre-patched binary instead of downloading
|
||||||
|
cat > "$out/lib/node_modules/freebuff/wrapper-launcher.js" << WRAPPER_EOF
|
||||||
|
#!/usr/bin/env node
|
||||||
|
const { spawn } = require('child_process');
|
||||||
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
|
|
||||||
|
// Use the Nix-store patched binary directly
|
||||||
|
const enginePath = process.env.FREEBUFF_ENGINE || '${placeholder "out"}/bin/freebuff-engine';
|
||||||
|
|
||||||
|
// Metadata path for version tracking
|
||||||
|
const configDir = path.join(process.env.HOME || '/', '.config', 'manicode');
|
||||||
|
const metadataPath = path.join(configDir, 'freebuff-metadata.json');
|
||||||
|
|
||||||
|
function resetTerminal() {
|
||||||
|
try {
|
||||||
|
if (process.stdin.isTTY && process.stdin.setRawMode) {
|
||||||
|
process.stdin.setRawMode(false);
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
try {
|
||||||
|
const seqs = '\\x1b[?1049l\\x1b[?1000l\\x1b[?1002l\\x1b[?1003l\\x1b[?1006l\\x1b[?2004l\\x1b[?25h';
|
||||||
|
if (process.stdout.isTTY) process.stdout.write(seqs);
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function main() {
|
||||||
|
// Copy patched binary to user config dir so the engine finds tree-sitter.wasm there too
|
||||||
|
fs.mkdirSync(configDir, { recursive: true });
|
||||||
|
const targetBinary = path.join(configDir, 'freebuff');
|
||||||
|
const targetWasm = path.join(configDir, 'tree-sitter.wasm');
|
||||||
|
|
||||||
|
// Install patched binary if not present or version mismatch
|
||||||
|
let needsInstall = !fs.existsSync(targetBinary);
|
||||||
|
if (!needsInstall) {
|
||||||
|
try {
|
||||||
|
const meta = JSON.parse(fs.readFileSync(metadataPath, 'utf8'));
|
||||||
|
needsInstall = (meta.version !== '${version}');
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (needsInstall) {
|
||||||
|
try { fs.unlinkSync(targetBinary); } catch {}
|
||||||
|
fs.copyFileSync(enginePath, targetBinary);
|
||||||
|
fs.chmodSync(targetBinary, 0o755);
|
||||||
|
fs.writeFileSync(metadataPath, JSON.stringify({ version: '${version}' }, null, 2));
|
||||||
|
|
||||||
|
// Copy tree-sitter.wasm if available
|
||||||
|
const wasmSrc = '${placeholder "out"}/bin/tree-sitter.wasm';
|
||||||
|
if (fs.existsSync(wasmSrc)) {
|
||||||
|
try { fs.copyFileSync(wasmSrc, targetWasm); } catch {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const child = spawn(targetBinary, process.argv.slice(2), {
|
||||||
|
stdio: 'inherit',
|
||||||
|
env: { ...process.env },
|
||||||
|
});
|
||||||
|
|
||||||
|
child.on('exit', (code, signal) => {
|
||||||
|
resetTerminal();
|
||||||
|
process.exit(signal ? 1 : (code || 0));
|
||||||
|
});
|
||||||
|
|
||||||
|
child.on('error', (err) => {
|
||||||
|
console.error('Failed to start freebuff:', err.message);
|
||||||
|
process.exit(1);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
main().catch((error) => {
|
||||||
|
console.error('Unexpected error:', error.message);
|
||||||
|
process.exit(1);
|
||||||
|
});
|
||||||
|
WRAPPER_EOF
|
||||||
|
|
||||||
|
# Create the main binary wrapper
|
||||||
makeWrapper "${nodejs}/bin/node" "$out/bin/freebuff" \
|
makeWrapper "${nodejs}/bin/node" "$out/bin/freebuff" \
|
||||||
--set NODE_PATH "$out/lib/node_modules" \
|
--set NODE_PATH "$out/lib/node_modules" \
|
||||||
--add-flags "$out/lib/node_modules/freebuff/index.js"
|
--add-flags "$out/lib/node_modules/freebuff/wrapper-launcher.js"
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
@@ -99,6 +206,6 @@ stdenv.mkDerivation rec {
|
|||||||
homepage = "https://codebuff.com";
|
homepage = "https://codebuff.com";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
mainProgram = "freebuff";
|
mainProgram = "freebuff";
|
||||||
platforms = platforms.all;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user