From 45ffb993fa878471256a11256487ba64240f7f9d Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:24 +0100 Subject: [PATCH] Revert "starship: fix build on Darwin" The ld64 issue has been fixed. This reverts commit 883e799eb2843d1438a5ce76ed8ac4a924cf6ce5. --- pkgs/by-name/st/starship/package.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/st/starship/package.nix b/pkgs/by-name/st/starship/package.nix index d5482bf24114..877f887a9569 100644 --- a/pkgs/by-name/st/starship/package.nix +++ b/pkgs/by-name/st/starship/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - llvmPackages, installShellFiles, writableTmpDirAsHomeHook, gitMinimal, @@ -23,24 +22,13 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-pStNE8SMMVavL3ld6RO+5QQRJPXpqlU3asccS2tUoMQ="; }; - nativeBuildInputs = [ - installShellFiles - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ]; + nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ writableTmpDirAsHomeHook ]; - env = { - TZDIR = "${tzdata}/share/zoneinfo"; - } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - # Work around ld64's libc++ hardening issue. - # - # TODO: Remove once #536365 reaches this branch. - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; + env.TZDIR = "${tzdata}/share/zoneinfo"; postInstall = '' presetdir=$out/share/starship/presets/