public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mpv: call with frameworks

Browse Source 
Referencing darwin.* directly makes overriding dependencies very
awkward.
This commit is contained in:
Daiderd Jordan 2020-02-07 22:09:23 +01:00
parent 3987ea9a9d
commit 408f36923d
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/video/mpv/default.nix
View File

@ -1,7 +1,8 @@
{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper { config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which
, ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs , ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs
, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin , nv-codec-headers, lua, libuchardet, libiconv ? null
, CoreFoundation, Cocoa, CoreAudio, MediaPlayer
, waylandSupport ? stdenv.isLinux , waylandSupport ? stdenv.isLinux
, wayland ? null , wayland ? null
@ -173,9 +174,7 @@ in stdenv.mkDerivation rec {
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ] ++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ]
++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ] ++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ++ optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ];
CoreFoundation Cocoa CoreAudio MediaPlayer
]);
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/top-level/all-packages.nix
View File

@ -20379,6 +20379,7 @@ in
mpv = callPackage ../applications/video/mpv { mpv = callPackage ../applications/video/mpv {
inherit lua; inherit lua;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
}; };
mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { };