From 4e60e200cc748c67a79ae546ab2a3674ec43e855 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:06 +0100 Subject: [PATCH] Revert "qemu: work around `ld64` hardening issue" The ld64 issue has been fixed. This reverts commit 7a83e820ddc2dd54a2ff6038ffe5a2f7a4005fb8. --- pkgs/by-name/qe/qemu/package.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/by-name/qe/qemu/package.nix b/pkgs/by-name/qe/qemu/package.nix index 57796c752243..978d4e21cecc 100644 --- a/pkgs/by-name/qe/qemu/package.nix +++ b/pkgs/by-name/qe/qemu/package.nix @@ -123,9 +123,6 @@ minimal ? toolsOnly || userOnly, gitUpdater, qemu-utils, # for tests attribute - - # TODO: Clean up on `staging`. - llvmPackages, }: assert lib.assertMsg ( @@ -183,9 +180,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals hexagonSupport [ glib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool - - # TODO: Clean up on `staging`. - llvmPackages.lld ] ++ lib.optionals (!userOnly) [ dtc ]; @@ -431,10 +425,6 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm ''; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; - passthru = { qemu-system-i386 = "bin/qemu-system-i386"; tests = lib.optionalAttrs (!toolsOnly) {