diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-04-07 00:27:17 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-04-07 13:45:32 -0700 |
| commit | af32997ae484a1fa694d87723a89c28f4549ab8c (patch) | |
| tree | b5f70be313e438030e2aeae646b9538a1adfbdda /pkgs/applications/terminal-emulators/alacritty | |
| parent | e3bbbfaf865a27cc3616a30a9554b3751f487c2a (diff) | |
| download | nixlib-af32997ae484a1fa694d87723a89c28f4549ab8c.tar nixlib-af32997ae484a1fa694d87723a89c28f4549ab8c.tar.gz nixlib-af32997ae484a1fa694d87723a89c28f4549ab8c.tar.bz2 nixlib-af32997ae484a1fa694d87723a89c28f4549ab8c.tar.lz nixlib-af32997ae484a1fa694d87723a89c28f4549ab8c.tar.xz nixlib-af32997ae484a1fa694d87723a89c28f4549ab8c.tar.zst nixlib-af32997ae484a1fa694d87723a89c28f4549ab8c.zip | |
alacritty: fix cross
This commit fixes cross compilation of alacritty by: 1. If xdg-utils.meta.broken (see https://github.com/NixOS/nixpkgs/pull/225112#issuecomment-1500354929), late-bind it via runtime $PATH rather than compile-time reference. 2. Use `$STRIP` instead of `strip`
Diffstat (limited to 'pkgs/applications/terminal-emulators/alacritty')
| -rw-r--r-- | pkgs/applications/terminal-emulators/alacritty/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index ae1bc591989d..574d9d17ccdf 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -84,7 +84,7 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; - postPatch = '' + postPatch = lib.optionalString (!xdg-utils.meta.broken) '' substituteInPlace alacritty/src/config/ui_config.rs \ --replace xdg-open ${xdg-utils}/bin/xdg-open ''; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { # patchelf generates an ELF that binutils' "strip" doesn't like: # strip: not enough room for program headers, try linking with -N # As a workaround, strip manually before running patchelf. - strip -S $out/bin/alacritty + $STRIP -S $out/bin/alacritty patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty '' |