logos-co/logos-plugin-qt
1
0
Fork 0
mirror of https://github.com/logos-co/logos-plugin-qt.git synced 2026-08-27 08:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(windows): stage an external library's DLL from <drv>/bin

Browse Source 
externalLibCopies flattens each external library into the module's ./lib
so CMake's find_library can see it, but it only ever reads <drv>/lib.

A library that follows the WINDOWS convention ships its runtime half in
bin/ -- that is CMake's own RUNTIME destination, and what openssl,
postgres and every autotools port in nixpkgs do. For those, the staged
lib/ ends up holding the import library or the static archive but no
.dll, and LogosModule.cmake then hard-fails with "found no companion DLL
in .../lib" -- or, worse, silently links the static archive instead.

Take that library's own .dll from bin/ as well. Matching only *.dll keeps
this inherently Windows-only (no native package ships one in bin/), so no
platform flag has to be threaded in and a native build provably cannot
pick up a stray executable.

Only THIS library's files are copied, never all of bin/: the dependency
DLLs that nixpkgs' win-dll-link hook stages there must stay symlinks,
created by the postFixup pass below. Copying them as real files would
make $out/lib look complete while leaving the Nix closure empty again --
a PE embeds no store paths, so those symlinks are the only thing the
reference scanner can see.

Verified by cross-building logos-delivery-module for x86_64-windows
against a logos-delivery that installs its .dll to bin/: the plugin links
the import library, and loads and dispatches on real Windows.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Dario Gabriel Lipicar
2026-08-14 10:29:11 -03:00
co-authored by Claude Opus 5
parent b8b9b4141f
commit a2f34149ca
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/buildPlugin.nix
+21
View File
@@ -97,6 +97,27 @@ let
if [ -d "${libInfo}/lib" ]; then
cp -r "${libInfo}/lib"/* lib/ 2>/dev/null || true
fi
# A library that follows the WINDOWS convention ships its runtime half
# in bin/ -- that is CMake's RUNTIME destination, and what openssl,
# postgres and every autotools port in nixpkgs do. Without this the
# staged lib/ holds the import library or the static archive but no
# .dll, and LogosModule.cmake then hard-fails with "found no companion
# DLL in .../lib" (or links the static archive by accident).
#
# Only THIS library's own files are taken, never all of bin/: the
# dependency DLLs that nixpkgs' win-dll-link hook stages there must stay
# symlinks, created by the postFixup pass below. Copying them as real
# files would make $out/lib look complete while leaving the Nix closure
# empty again -- a PE embeds no store paths, so those symlinks are the
# only thing the reference scanner can see.
# Matching only *.dll keeps this inherently Windows-only -- no native
# package ships one in bin/ -- so no platform flag has to be threaded
# in, and a native build provably cannot pick up a stray executable.
if [ -d "${libInfo}/bin" ]; then
for f in "${libInfo}"/bin/lib${extLib.name}.dll "${libInfo}"/bin/${extLib.name}.dll; do
[ -f "$f" ] && cp -fL "$f" lib/ 2>/dev/null || true
done
fi
if [ -f "${libInfo}" ]; then
cp "${libInfo}" lib/ 2>/dev/null || true
fi