Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mpv: add flag for swift on darwin #79344

Merged
merged 2 commits into from Feb 19, 2020
Merged

mpv: add flag for swift on darwin #79344

merged 2 commits into from Feb 19, 2020

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Feb 6, 2020 •
edited

While we currently don't have a pure swift build on macOS it's possible
to build mpv using the swift compiler from CLT. eg.

    self: super:
    let
      CommandLineTools = "/Library/Developer/CommandLineTools";
    in
    {
      swift = super.stdenv.mkDerivation {
        name = "swift-CommandLineTools-0.0.0";
        phases = [ "installPhase" "fixupPhase" ];

        propagatedBuildInputs = [ self.darwin.DarwinTools ];

        installPhase = ''
            mkdir -p $out/bin $out/lib
            ln -s ${CommandLineTools}/usr/bin/swift $out/bin
            ln -s ${CommandLineTools}/usr/lib/swift $out/lib
            ln -s ${CommandLineTools}/SDKs $out
        '';

        setupHook = builtins.toFile "hook" ''
            addCommandLineTools() {
                echo >&2
                echo "WARNING: this is impure and unreliable, make sure the CommandLineTools are installed!" >&2
                echo "  $ xcode-select --install" >&2
                echo >&2
                [ -d ${CommandLineTools} ]
                export NIX_LDFLAGS+=" -L@out@/lib/swift/macosx"
                export SWIFT=swift
                export SWIFT_LIB_DYNAMIC=@out@/lib/swift/macosx
                export MACOS_SDK_VERSION=$(sw_vers -productVersion | awk -F. '{print $1 "." $2}')
                export MACOS_SDK=@out@/SDKs/MacOSX$MACOS_SDK_VERSION.sdk
            }

            prePhases+=" addCommandLineTools"
        '';

        __impureHostDeps = [ CommandLineTools ];
      };

      mpv = super.mpv.override { swiftSupport = true; };
    }
Motivation for this change

The latest release still builds but isn't functional without swift.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@LnL7
mpv: add flag for swift on darwin
3987ea9 
While we currently don't have a pure swift build on macOS it's possible
to build mpv using the swift compiler from CLT. eg.

    self: super:
    let
      CommandLineTools = "/Library/Developer/CommandLineTools";
    in
    {
      swift = super.stdenv.mkDerivation {
        name = "swift-CommandLineTools-0.0.0";
        phases = [ "installPhase" "fixupPhase" ];

        propagatedBuildInputs = [ self.darwin.DarwinTools ];

        installPhase = ''
            mkdir -p $out/bin $out/lib
            ln -s ${CommandLineTools}/usr/bin/swift $out/bin
            ln -s ${CommandLineTools}/usr/lib/swift $out/lib
            ln -s ${CommandLineTools}/SDKs $out
        '';

        setupHook = builtins.toFile "hook" ''
            addCommandLineTools() {
                echo >&2
                echo "WARNING: this is impure and unreliable, make sure the CommandLineTools are installed!" >&2
                echo "  $ xcode-select --install" >&2
                echo >&2
                [ -d ${CommandLineTools} ]
                export NIX_LDFLAGS+=" -L@out@/lib/swift/macosx"
                export SWIFT=swift
                export SWIFT_LIB_DYNAMIC=@out@/lib/swift/macosx
                export MACOS_SDK_VERSION=$(sw_vers -productVersion | awk -F. '{print $1 "." $2}')
                export MACOS_SDK=@out@/SDKs/MacOSX$MACOS_SDK_VERSION.sdk
            }

            prePhases+=" addCommandLineTools"
        '';

        __impureHostDeps = [ CommandLineTools ];
      };

      mpv = super.mpv.override { swiftSupport = true; };
    }
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Feb 6, 2020
@veprbl veprbl mentioned this pull request Feb 6, 2020
Closed
@veprbl
Copy link
Member

veprbl commented Feb 6, 2020

Some more background on the cocoa-cb backend: mpv-player/mpv@c5e4538

@toonn
Copy link
Contributor

toonn commented Feb 7, 2020

Hmm, I was trying this out but I'm running into a weird issue. It seems like my shell is aborting nix. I haven't encountered this before and I'm not sure how to solve it.

toonn@terra ~> nix-shell -p mpv
warning: Nix search path entry '/nix/var/nix/profiles/per-user/root/channels' does not exist, ignoring
Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS
fish: “nix-shell -p mpv” terminated by signal SIGABRT (Abort)

@LnL7
Copy link
Member Author

LnL7 commented Feb 7, 2020

@toonn That's an evaluation issue. I think something in your NIX_PATH or overlays is causing a a lot of memory usage, this error usually occurs when trying to evaluate all of nixpkgs.

@LnL7
mpv: call with frameworks
408f369 
Referencing darwin.* directly makes overriding dependencies very
awkward.
@cust0dian-old
Copy link
Contributor

I can confirm that mpv from this PR with example overlay builds and runs successfully (macOS 10.14.6)

@LnL7 LnL7 merged commit 230ab62 into NixOS:master Feb 19, 2020
@LnL7 LnL7 deleted the darwin-mpv-swift branch February 19, 2020 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cust0dian-old cust0dian-old cust0dian-old approved these changes

@globin globin Awaiting requested review from globin

@AndersonTorres AndersonTorres Awaiting requested review from AndersonTorres

@Ma27 Ma27 Awaiting requested review from Ma27

@fpletz fpletz Awaiting requested review from fpletz

@tadeokondrak tadeokondrak Awaiting requested review from tadeokondrak

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@LnL7 @veprbl @toonn @cust0dian-old