mpv: enable swift support #214944

azuwis · 2023-02-06T14:30:55Z

Description of changes

Since swift is available on master now, I've rebased @stephank's work on mpv stephank@4ce183c to master, and made this pull request for discussion.

When I used nix-tree to check the closure size of the built mpv, I've found swift lib references clang, and make the closure size pretty big:

$ ls -l /nix/store/2cp55whf6v3631512w4hlsrc4v7r8w36-swift-5.7.3-lib/lib/swift
total 0
dr-xr-xr-x  6 root nixbld 192 Jan  1  1970 FrameworkABIBaseline
dr-xr-xr-x  5 root nixbld 160 Jan  1  1970 _InternalSwiftScan
dr-xr-xr-x  5 root nixbld 160 Jan  1  1970 _InternalSwiftStaticMirror
dr-xr-xr-x  5 root nixbld 160 Jan  1  1970 _InternalSwiftSyntaxParser
dr-xr-xr-x  4 root nixbld 128 Jan  1  1970 apinotes
lrwxr-xr-x  1 root nixbld  78 Jan  1  1970 clang -> /nix/store/avrf44cq2cr18vlvv20aa1pc85cl7rzg-clang-wrapper-14.0.6/resource-root
dr-xr-xr-x 28 root nixbld 896 Jan  1  1970 macosx
dr-xr-xr-x 12 root nixbld 384 Jan  1  1970 migrator
dr-xr-xr-x 27 root nixbld 864 Jan  1  1970 shims

Is that expected?

Removing preConfigure will make the closure size even bigger:

Things done

azuwis · 2023-02-06T14:39:24Z

Related #160828 #204979

pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix

wegank · 2023-02-06T18:13:39Z

@ofborg build mpv mpv.passthru.tests

stephank · 2023-02-06T20:03:37Z

Thanks for point out the closure size! It's something I'll make a PR for separately.

I'm seeing the same build failure as ofBorg on x86_64-darwin, but I don't understand it yet.

AndersonTorres · 2023-02-06T21:49:18Z

Unfortunately (or not) I can't possibly comment, because this is too Darwin-specific to me.

Nonetheless, I wish good luck.

azuwis · 2023-02-07T02:31:44Z

The error log on x86_64-darwin is different before and after commit 64bce1d

Before(https://logs.nix.ci/?key=nixos/nixpkgs.214944&attempt_id=5ab1c3e7-d414-4bbe-9a9a-0bce635c1dc4):

[21/452] Generating generated/osdep/swift_targets with a custom command
FAILED: generated/osdep/macOS_swift.swiftmodule generated/osdep/macOS_swift.h generated/osdep/macOS_swift.o 
/nix/store/5mldrl986vi6b8lk3gdw8r5mjxqx5i9j-swift-wrapper-5.7.3/bin/swift -frontend -c -sdk /nix/store/bfgqhz5n5ad83h9bqxzvhz158fb03vyz-SDKs/MacOSX10.12.sdk -enable-objc-interop -emit-objc-header -parse-as-library -O -D HAVE_MACOS_10_11_FEATURES -module-name macOS_swift -emit-module-path generated/osdep/macOS_swift.swiftmodule -import-objc-header /private/tmp/nix-build-mpv-0.35.1.drv-0/source/osdep/macOS_swift_bridge.h -emit-objc-header-path generated/osdep/macOS_swift.h -o generated/osdep/macOS_swift.o ../osdep/macos/libmpv_helper.swift ../osdep/macos/log_helper.swift ../osdep/macos/mpv_helper.swift ../osdep/macos/swift_compat.swift ../osdep/macos/swift_extensions.swift ../video/out/mac/common.swift ../video/out/mac/title_bar.swift ../video/out/mac/view.swift ../video/out/mac/window.swift ../video/out/cocoa_cb_common.swift ../video/out/mac/gl_layer.swift ../osdep/macos/remote_command_center.swift -I. -I/private/tmp/nix-build-mpv-0.35.1.drv-0/source
../osdep/macos/libmpv_helper.swift:18:8: error: no such module 'Cocoa'
import Cocoa
       ^
Please submit a bug report (https://swift.org/contributing/#reporting-bugs) and include the project and the crash backtrace.

After(https://logs.nix.ci/?key=nixos/nixpkgs.214944&attempt_id=76802592-760c-47e1-9141-4465b7c78f4c):

[21/452] Generating generated/osdep/swift_targets with a custom command
FAILED: generated/osdep/macOS_swift.swiftmodule generated/osdep/macOS_swift.h generated/osdep/macOS_swift.o 
/nix/store/5mldrl986vi6b8lk3gdw8r5mjxqx5i9j-swift-wrapper-5.7.3/bin/swift -frontend -c -sdk /nix/store/y421982rvq7fwfcygxhwala06fxq4sdm-SDKs/MacOSX11.0.sdk -enable-objc-interop -emit-objc-header -parse-as-library -O -D HAVE_MACOS_10_11_FEATURES -D HAVE_MACOS_10_14_FEATURES -module-name macOS_swift -emit-module-path generated/osdep/macOS_swift.swiftmodule -import-objc-header /private/tmp/nix-build-mpv-0.35.1.drv-0/source/osdep/macOS_swift_bridge.h -emit-objc-header-path generated/osdep/macOS_swift.h -o generated/osdep/macOS_swift.o ../osdep/macos/libmpv_helper.swift ../osdep/macos/log_helper.swift ../osdep/macos/mpv_helper.swift ../osdep/macos/swift_compat.swift ../osdep/macos/swift_extensions.swift ../video/out/mac/common.swift ../video/out/mac/title_bar.swift ../video/out/mac/view.swift ../video/out/mac/window.swift ../video/out/cocoa_cb_common.swift ../video/out/mac/gl_layer.swift ../osdep/macos/remote_command_center.swift -I. -I/private/tmp/nix-build-mpv-0.35.1.drv-0/source
<module-includes>:1:9: note: in file included from <module-includes>:1:
#import "Headers/OpenGL.h"
        ^
/nix/store/7i2mvhisb2wnjcvc9jvzlxn78mlsiazq-apple-framework-OpenGL-11.0.0/Library/Frameworks/OpenGL.framework/Headers/OpenGL.h:31:147: error: pasting formed '__MAC_10.0', an invalid preprocessing token
extern CGLError CGLChoosePixelFormat(const CGLPixelFormatAttribute *attribs, CGLPixelFormatObj OPENGL_NULLABLE * OPENGL_NONNULL pix, GLint *npix) OPENGL_DEPRECATED(10.0, 10.14);
                                                                                                                                                  ^
/nix/store/xgb5hzizdmrh83672gxn5llx74vqz0r3-apple-framework-OpenGL/Library/Frameworks/OpenGL.framework/Headers/OpenGLAvailability.h:11:74: note: expanded from macro 'OPENGL_DEPRECATED'
#define OPENGL_DEPRECATED(from, to) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_##from, __MAC_##to, __IPHONE_NA, __IPHONE_NA)
                                                                         ^

I can reproduce the same error using nix build .#legacyPackages.x86_64-darwin.mpv on a aarch64-darwin machine.

Atemu

Result of nixpkgs-review pr 214944 run on aarch64-darwin 1

1 package built:

mpv

Diff LGTM and it works just fine on aarch64-darwin.

Closure size optimisation can come later, that's not a hard blocker IMO.

Once the x86 issue is fixed, this is good to go.

pkgs/applications/video/mpv/default.nix

This commit should be reverted after [x86_64-darwin build failure][1] is fixed [1]: https://logs.nix.ci/?key=nixos/nixpkgs.214944&attempt_id=76802592-760c-47e1-9141-4465b7c78f4c

Atemu

Result of nixpkgs-review pr 214944 run on aarch64-darwin 1

5 packages marked as broken and skipped:

hydrus
jellyfin-mpv-shim
mpc-qt
plex-mpv-shim
sublime-music

2 packages failed to build:

mnemosyne
subtitleedit

11 packages built:

ani-cli
anki
cplay-ng
curseradio
dmlive
mpv-unwrapped
python310Packages.mpv
python311Packages.mpv
somafm-cli
wtwitch
ytfzf

wegank · 2023-03-06T15:41:08Z

Result of nixpkgs-review pr 214944 run on aarch64-darwin 1

5 packages marked as broken and skipped:

hydrus
jellyfin-mpv-shim
mpc-qt
plex-mpv-shim
sublime-music

13 packages built:

ani-cli
anki
cplay-ng
curseradio
dmlive
mnemosyne
mpv-unwrapped
python310Packages.mpv
python311Packages.mpv
somafm-cli
subtitleedit
wtwitch
ytfzf

Swift support doesn’t seem to work with back-deployed dylibs, so set the deployment target to 10.15 to force Swift to link against the system Swift libraries. The change to use the Swift stdenv fixes the errors reported in NixOS#214944.

wegank reviewed Feb 6, 2023

View reviewed changes

pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix Outdated Show resolved Hide resolved

ofborg bot requested review from AndersonTorres, tadeokondrak, globin, fpletz and Ma27 February 6, 2023 14:45

ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 501-1000 10.rebuild-linux: 11-100 labels Feb 6, 2023

azuwis force-pushed the mpv branch 2 times, most recently from 53b6d6a to 5988220 Compare February 6, 2023 14:56

wegank mentioned this pull request Feb 6, 2023

mpv: prepare for swift on darwin #204979

Closed

13 tasks

ofborg bot added 10.rebuild-darwin: 11-100 and removed 10.rebuild-darwin: 501+ 10.rebuild-darwin: 501-1000 labels Feb 6, 2023

Atemu approved these changes Feb 7, 2023

View reviewed changes

mweinelt added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 8, 2023

wegank added the 6.topic: darwin Running or building packages on Darwin label Feb 14, 2023

ylh reviewed Feb 27, 2023

View reviewed changes

pkgs/applications/video/mpv/default.nix Outdated Show resolved Hide resolved

Atemu reviewed Feb 27, 2023

View reviewed changes

pkgs/applications/video/mpv/default.nix Outdated Show resolved Hide resolved

stephank and others added 3 commits February 28, 2023 11:10

mpv: enable swift support

f0a6216

mpv: Switch to apple_sdk_11_0 for darwin

5b8e896

mpv: Only enable swift support on aarch64-darwin

8a28ae8

This commit should be reverted after [x86_64-darwin build failure][1] is fixed [1]: https://logs.nix.ci/?key=nixos/nixpkgs.214944&attempt_id=76802592-760c-47e1-9141-4465b7c78f4c

azuwis force-pushed the mpv branch from 64bce1d to 8a28ae8 Compare February 28, 2023 03:19

Atemu approved these changes Feb 28, 2023

View reviewed changes

wegank approved these changes Mar 6, 2023

View reviewed changes

Atemu merged commit 1cd0291 into NixOS:master Mar 6, 2023

azuwis deleted the mpv branch April 11, 2023 06:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mpv: enable swift support #214944

mpv: enable swift support #214944

azuwis commented Feb 6, 2023 •

edited by AndersonTorres

Loading

azuwis commented Feb 6, 2023

wegank commented Feb 6, 2023

stephank commented Feb 6, 2023

AndersonTorres commented Feb 6, 2023

azuwis commented Feb 7, 2023

Atemu left a comment

Atemu left a comment

wegank commented Mar 6, 2023

mpv: enable swift support #214944

mpv: enable swift support #214944

Conversation

azuwis commented Feb 6, 2023 • edited by AndersonTorres Loading

Description of changes

Things done

azuwis commented Feb 6, 2023

wegank commented Feb 6, 2023

stephank commented Feb 6, 2023

AndersonTorres commented Feb 6, 2023

azuwis commented Feb 7, 2023

Atemu left a comment

Choose a reason for hiding this comment

Atemu left a comment

Choose a reason for hiding this comment

wegank commented Mar 6, 2023

azuwis commented Feb 6, 2023 •

edited by AndersonTorres

Loading