summary refs log tree commit diff
path: root/pkgs/applications/terminal-emulators/alacritty/default.nix
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2023-06-30 11:16:28 -0700
committerAdam Joseph <adam@westernsemico.com>2023-06-30 11:19:45 -0700
commit64d0029e285983c599516e1ec62d9997bb28ab53 (patch)
tree4130ea3bb9014ff4b9714dc97d2a786754a60056 /pkgs/applications/terminal-emulators/alacritty/default.nix
parent05b84a2b837d772b6c2b1218f7e6df91fe4dd7f0 (diff)
downloadnixpkgs-64d0029e285983c599516e1ec62d9997bb28ab53.tar
nixpkgs-64d0029e285983c599516e1ec62d9997bb28ab53.tar.gz
nixpkgs-64d0029e285983c599516e1ec62d9997bb28ab53.tar.bz2
nixpkgs-64d0029e285983c599516e1ec62d9997bb28ab53.tar.lz
nixpkgs-64d0029e285983c599516e1ec62d9997bb28ab53.tar.xz
nixpkgs-64d0029e285983c599516e1ec62d9997bb28ab53.tar.zst
nixpkgs-64d0029e285983c599516e1ec62d9997bb28ab53.zip
alacritty: --add-rpath instead of --set-rpath
As reported by @blucoat in
https://github.com/NixOS/nixpkgs/issues/219213 alacritty's RPATH is
missing many of the libraries which it links to, including for
example glibc.

The problem was diagnosed by @kchibisov as being caused by
alacritty's use of `--set-rpath` (which completely replaces the
rpath) instead of `--add-rpath` (which adds additional entries to
the rpath):

  https://github.com/NixOS/nixpkgs/issues/219213#issuecomment-1507655801

This commit implements @kchibisov's idea to change `--set-rpath` to
`--add-rpath`:

  https://github.com/NixOS/nixpkgs/issues/219213#issuecomment-1507691822

Closes #219213
Diffstat (limited to 'pkgs/applications/terminal-emulators/alacritty/default.nix')
-rw-r--r--pkgs/applications/terminal-emulators/alacritty/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix
index 9f20a2d0576..2a6f958b1a2 100644
--- a/pkgs/applications/terminal-emulators/alacritty/default.nix
+++ b/pkgs/applications/terminal-emulators/alacritty/default.nix
@@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec {
       # As a workaround, strip manually before running patchelf.
       $STRIP -S $out/bin/alacritty
 
-      patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+      patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
     ''
   ) + ''