diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
| commit | d9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch) | |
| tree | 82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/applications/video/mpv/default.nix | |
| parent | 8b834605628fabd43b1b26a1724fb22c83150e2d (diff) | |
| parent | 8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff) | |
| download | nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.gz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.bz2 nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.lz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.xz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.zst nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/applications/video/mpv/default.nix')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 55ab1b95489..c384455d672 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -171,9 +171,12 @@ in stdenv.mkDerivation rec { buildPhase = '' python3 ${waf} build + '' + optionalString stdenv.isDarwin '' + python3 TOOLS/osxbundle.py -s build/mpv ''; - installPhase = + # Ensure youtube-dl is available in $PATH for mpv + wrapperFlags = let getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" + "${luasocket}/share/lua/${lua.luaversion}/?.${type}"; @@ -181,24 +184,32 @@ in stdenv.mkDerivation rec { luaCPath = getPath "so"; in '' - python3 ${waf} install - - # Use a standard font - mkdir -p $out/share/mpv - ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf - # Ensure youtube-dl is available in $PATH for MPV - wrapProgram $out/bin/mpv \ --prefix LUA_PATH : "${luaPath}" \ --prefix LUA_CPATH : "${luaCPath}" \ '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" - '' + '' + ''; + + installPhase = '' + python3 ${waf} install + + # Use a standard font + mkdir -p $out/share/mpv + ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf + wrapProgram "$out/bin/mpv" \ + ${wrapperFlags} cp TOOLS/umpv $out/bin wrapProgram $out/bin/umpv \ --set MPV "$out/bin/mpv" + + '' + optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r build/mpv.app $out/Applications + wrapProgram "$out/Applications/mpv.app/Contents/MacOS/mpv" \ + ${wrapperFlags} ''; meta = with stdenv.lib; { |