git.iko.soy/typeable/nixpkgs
on master help sign in
mpv: call with frameworks

Referencing darwin.* directly makes overriding dependencies very awkward.

commit408f36923dd1efdc00dde6ed917945df6b625cbb authorDaiderd Jordan <daiderd@gmail.com> dateFri 7 Feb 2020, 22:09 (7 years ago) parent3987ea9
2 files changed+4−4
pkgs/applications/video/mpv/default.nix+3−4 pkgs/top-level/all-packages.nix+1
pkgs/applications/video/mpv/default.nix+3−4
@@ -1,7 +1,8 @@
11{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
22, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which
33, ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs
4−, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin
4+, nv-codec-headers, lua, libuchardet, libiconv ? null
5+, CoreFoundation, Cocoa, CoreAudio, MediaPlayer
56
67, waylandSupport ? stdenv.isLinux
78 , wayland ? null
@@ -173,9 +174,7 @@ in stdenv.mkDerivation rec {
173174 ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
174175 ++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ]
175176 ++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ]
176− ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
177− CoreFoundation Cocoa CoreAudio MediaPlayer
178− ]);
177+ ++ optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ];
179178
180179 enableParallelBuilding = true;
181180
pkgs/top-level/all-packages.nix+1
@@ -20379,6 +20379,7 @@ in
2037920379
2038020380 mpv = callPackage ../applications/video/mpv {
2038120381 inherit lua;
20382+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
2038220383 };
2038320384
2038420385 mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { };