Revert "mpv-unwrapped: fix darwin build (fixes #540682)"
The ld64 issue has been fixed.
This reverts commit 1dbdb986bb.
This commit is contained in:
@@ -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 ''
|
||||
|
||||
Reference in New Issue
Block a user