diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2025-02-02 17:53:09 -0500 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2025-02-03 15:57:36 -0500 |
| commit | e65677969e7ba6afd6c327379e24da0bed2f3adc (patch) | |
| tree | ba6c1f38ed2391d7c63781c5cd8d8e05e05598b0 /nongnu/packages/editors.scm | |
| parent | 5c6ef7cafdfabdacae8ce33410b41168a952d4ff (diff) | |
nonguix: binary-build-system: Use add-rpath instead of set-rpath.
Fixes #369.
Previously we were using "patchelf --set-rpath" in binary-build-system for
binaries to find dependencies in Guix. However, this will override any
previous setting, including if "$ORIGIN" was in RUNPATH.
For Electron applications specifically (like signal-desktop and heroic),
bundled libraries were not found without wrapping with LD_LIBRARY_PATH. While
this does work, it is not ideal and led to issues in child processes that
inherit LD_LIBRARY_PATH, namely breaking games using Wine/Proton in Heroic.
A possible consequence of this commit is that Guix added paths to RUNPATH are
after what was originally set, perhaps leading to library
loading/compatibility issues. However, we always try to replace all needed
libraries with Guix packages (just that Electron applications seem to require
bundled libraries in $ORIGIN).
* nonguix/build/binary-build-system.scm (patchelf): Use add-rpath instead of set-rpath.
* nongnu/packages/game-client.scm (heroic-client)[arguments]<#:phases>: Remove
'wrap-where-patchelf-does-not-work phase as it is no longer needed (needed
libraries are found with $ORIGIN preserved in RUNPATH).
* nongnu/packages/messaging.scm (element-desktop, signal-desktop): Likewise.
* nongnu/packages/editors.scm (vscodium): Likewise.
Diffstat (limited to 'nongnu/packages/editors.scm')
| -rw-r--r-- | nongnu/packages/editors.scm | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/nongnu/packages/editors.scm b/nongnu/packages/editors.scm index 4d19646..9073c9c 100644 --- a/nongnu/packages/editors.scm +++ b/nongnu/packages/editors.scm @@ -83,15 +83,7 @@ #:startup-w-m-class "Code" #:comment '(("en" "Code Editing. Redefined.") - (#f "Code Editing. Redefined.")))))) - (add-after 'install-wrapper 'wrap-where-patchelf-does-not-work - (lambda _ - (wrap-program (string-append #$output "/bin/codium") - `("LD_LIBRARY_PATH" ":" - prefix - (,(string-join - (list (string-append #$output "/opt/vscodium")) - ":"))))))))) + (#f "Code Editing. Redefined."))))))))) (supported-systems '("armhf-linux" "aarch64-linux" "x86_64-linux")) (native-inputs (list tar)) |