From 6dfa35220cab1d9c0f7e1364cb3937adec845792 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:17 +0100 Subject: [PATCH] Revert "mpv-unwrapped: fix darwin build (fixes #540682)" The ld64 issue has been fixed. This reverts commit 1dbdb986bbaf6551ac3a97871b9b90bf16f44728. --- pkgs/by-name/mp/mpv-unwrapped/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix index 924f515fff27..4333d1ce35f5 100644 --- a/pkgs/by-name/mp/mpv-unwrapped/package.nix +++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix @@ -61,7 +61,6 @@ wayland-protocols, wayland-scanner, zimg, - llvmPackages, # Boolean alsaSupport ? stdenv.hostPlatform.isLinux, @@ -164,8 +163,6 @@ stdenv.mkDerivation (finalAttrs: { buildPackages.darwin.sigtool swift makeBinaryWrapper - # TODO: Remove once #536365 reaches this branch - llvmPackages.lld ] ++ lib.optionals waylandSupport [ wayland-scanner ]; @@ -236,9 +233,6 @@ stdenv.mkDerivation (finalAttrs: { # ./osdep/mac/swift.h:270:9: fatal error: '.../app_bridge_objc-1.pch' file not found env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin) { NIX_SWIFTFLAGS_COMPILE = "-disable-bridging-pch"; - - # TODO: Remove once #536365 reaches this branch - NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; postBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''