diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2023-04-08 05:49:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-08 05:49:12 +0100 |
| commit | 456d8190ad756a30d69064381b5149bceabc14a6 (patch) | |
| tree | 4ad315fcfc8737ab694abc49c72a844401c52a69 | |
| parent | 5947116ce70c833ab05564a244b0edbea514416b (diff) | |
| parent | af32997ae484a1fa694d87723a89c28f4549ab8c (diff) | |
| download | nixpkgs-456d8190ad756a30d69064381b5149bceabc14a6.tar nixpkgs-456d8190ad756a30d69064381b5149bceabc14a6.tar.gz nixpkgs-456d8190ad756a30d69064381b5149bceabc14a6.tar.bz2 nixpkgs-456d8190ad756a30d69064381b5149bceabc14a6.tar.lz nixpkgs-456d8190ad756a30d69064381b5149bceabc14a6.tar.xz nixpkgs-456d8190ad756a30d69064381b5149bceabc14a6.tar.zst nixpkgs-456d8190ad756a30d69064381b5149bceabc14a6.zip | |
Merge pull request #225119 from amjoseph-nixpkgs/pr/alacritty/fix-cross
alacritty: fix cross
| -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 ae1bc591989..574d9d17ccd 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 '' |