diff options
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/video/obs-studio/linuxbrowser.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/smplayer/default.nix | 4 |
3 files changed, 11 insertions, 16 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 4e4c623ca60..ffbaa9fffdf 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs, mujs -, lua, luasocket, libuchardet, libiconv ? null, darwin +, lua, libuchardet, libiconv ? null, darwin , waylandSupport ? false , wayland ? null @@ -92,6 +92,8 @@ let "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; sha256 = "0j7sbn3w6bgslvwwh5v9527w3gi2sd08kskrgxamx693y0b0i3ia"; }; + luaEnv = lua.withPackages(ps: with ps; [ luasocket]); + in stdenv.mkDerivation rec { name = "mpv-${version}"; version = "0.29.1"; @@ -139,7 +141,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg_4 freetype libass libpthreadstubs - lua luasocket libuchardet mujs + luaEnv libuchardet mujs ] ++ optional alsaSupport alsaLib ++ optional archiveSupport libarchive ++ optional bluraySupport libbluray @@ -183,16 +185,9 @@ in stdenv.mkDerivation rec { # 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}"; - luaPath = getPath "lua"; - luaCPath = getPath "so"; - in - '' - --prefix LUA_PATH : "${luaPath}" \ - --prefix LUA_CPATH : "${luaCPath}" \ - '' + optionalString youtubeSupport '' + + ''--prefix PATH : "${luaEnv}/bin" \'' + + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index b8bd6ce07eb..6d02233be32 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "obs-linuxbrowser-${version}"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "bazukas"; repo = "obs-linuxbrowser"; rev = version; - sha256 = "1vwgdgcmab5442wh2rjww6lzij9g2c5ccnv79rs7vx3rdl8wqg4f"; + sha256 = "000ngkiwfjjl25v4hz6lh6mdkf119pnq0qv3jwdmmp6fpd0dxcgh"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 52876bb1bbc..00c0d7b6dc2 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-18.10.0"; + name = "smplayer-19.1.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "1sql1rd4h74smkapjf5c686zbdqqaf44h7k7z5bxfvfcsad7rzrd"; + sha256 = "0q23nsmmdhj4kb90axaqrzv5pyj7szbwy8l3skl53yi8r4j3sj3s"; }; buildInputs = [ qtscript ]; |