From af32997ae484a1fa694d87723a89c28f4549ab8c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 7 Apr 2023 00:27:17 -0700 Subject: [PATCH] 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` --- pkgs/applications/terminal-emulators/alacritty/default.nix | 4 ++-- 1 file 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 ''