From 8d9ac2131da3f6938512912b874d0ff22cb1a48a Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 18 Nov 2024 09:27:16 +0000 Subject: [PATCH] =?UTF-8?q?mpv:=20restore=20non=E2=80=90obsolete=20Swift?= =?UTF-8?q?=20library=20path=20hack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Turns out that it’s not obsolete; it avoids a runtime dependency on the Swift wrapper because of some weird stuff we do. This should probably be fixed in the Swift packaging, but let’s fix the closure size again for now and add a comment for that. This reverts commit 84d64ade98bd69f4dbe3534560e15dae2839d1d4. Fixes: #356861 --- pkgs/applications/video/mpv/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 8624506e52e4..30a3fa8be994 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -129,6 +129,12 @@ stdenv.mkDerivation (finalAttrs: { '' ]; + # Ensure we reference 'lib' (not 'out') of Swift. + # TODO: Remove this once the Swift wrapper doesn’t include these. + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' + export SWIFT_LIB_DYNAMIC="${lib.getLib swift.swift}/lib/swift/macosx" + ''; + mesonFlags = [ (lib.mesonOption "default_library" "shared") (lib.mesonBool "libmpv" true)