From 143c0c5551b828ce86d66d273fea8899af2018a3 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 24 Nov 2020 10:32:02 +0100 Subject: [PATCH] genodePackages: symlink *.lib.so to lib*.so in depot outputs This less about linking to lib*.so and more about the Bintools package detecting that these actually are directories containing libraries. --- packages/genodelabs/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/packages/genodelabs/default.nix b/packages/genodelabs/default.nix index 4f25f65..91d9e3e 100644 --- a/packages/genodelabs/default.nix +++ b/packages/genodelabs/default.nix @@ -223,10 +223,24 @@ let installPhase = '' runHook preInstall rm -r depot/genodelabs/bin/${arch}/${name}/*\.build + + local outputLibDir="''${!outputLib}/lib" find depot/genodelabs/bin/${arch}/${name} -name '*.lib.so' \ - -exec install -Dt "''${!outputLib}/lib" {} \; -delete + -exec install -Dt "$outputLibDir" {} \; -delete + if [ -d "$outputLibDir" ]; then + pushd "$outputLibDir" + for src in *.lib.so; do + dst=$src + dst="''${dst#lib}" + dst="''${dst%.lib.so}" + ln -s "$src" lib"$dst".so + done + popd + fi + find depot/genodelabs/bin/${arch}/${name} -executable \ -exec install -Dt "''${!outputBin}/bin" {} \; + runHook postInstall ''; @@ -299,7 +313,7 @@ let basePatches = [ ./patches/cxx-align.patch ./patches/core-diag.patch - ./patches/ld-ro.patch + ./patches/ld-ro.patch ]; in makePackages // depotPackages // {