diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-04-08 11:32:55 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-04-08 11:33:08 +0200 |
| commit | fd77cd7a01f558ae47b446fc21e5666e5ded6814 (patch) | |
| tree | 1e44aa7c533520b8d8158d554a200e3fa088055d /pkgs/applications/terminal-emulators | |
| parent | 46f29d4bd6305a9f7c743d3f9022a8d5f6d3cb12 (diff) | |
| parent | 97ad0928a5cb6512af4f92be062e9b31edc485d4 (diff) | |
Merge branch 'master' into staging-next
Indentation conflict in vulkan-related src fetches.
Diffstat (limited to 'pkgs/applications/terminal-emulators')
| -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 f88a944fdb6cb..d7f3c357150b5 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -82,7 +82,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 ''; @@ -102,7 +102,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 '' |