diff options
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/aegisub/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 43 | ||||
-rw-r--r-- | pkgs/applications/video/openshot-qt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/peek/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/screenkey/default.nix | 60 | ||||
-rw-r--r-- | pkgs/applications/video/screenkey/paths.patch | 20 |
6 files changed, 112 insertions, 21 deletions
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index ebc1249dc11d..341ae5fd2737 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { # but they are linked against GPL'd softwares # - so the resulting program will be GPL maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 403fc7e4ee11..1616665b75d5 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg , freefont_ttf, freetype, libass, libpthreadstubs -, lua, lua5_sockets, libuchardet, libiconv ? null, darwin +, lua, luasocket, libuchardet, libiconv ? null, darwin , x11Support ? true, mesa ? null, @@ -13,25 +13,25 @@ wayland ? null, libxkbcommon ? null -, rubberbandSupport ? !stdenv.isDarwin, rubberband ? null +, rubberbandSupport ? true, rubberband ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null , sdl2Support ? true, SDL2 ? null -, alsaSupport ? !stdenv.isDarwin, alsaLib ? null +, alsaSupport ? true, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? true, libvdpau ? null -, dvdreadSupport ? !stdenv.isDarwin, libdvdread ? null -, dvdnavSupport ? dvdreadSupport, libdvdnav ? null +, dvdreadSupport ? true, libdvdread ? null +, dvdnavSupport ? true, libdvdnav ? null , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null , bs2bSupport ? true, libbs2b ? null , cacaSupport ? true, libcaca ? null , libpngSupport ? true, libpng ? null , youtubeSupport ? true, youtube-dl ? null , vaapiSupport ? true, libva ? null -, drmSupport ? !stdenv.isDarwin, libdrm ? null +, drmSupport ? true, libdrm ? null , vapoursynthSupport ? false, vapoursynth ? null , archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null @@ -127,14 +127,15 @@ in stdenv.mkDerivation rec { python3 ${waf} configure --prefix=$out $configureFlags ''; - nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ]; + nativeBuildInputs = [ + docutils makeWrapper perl + pkgconfig python3 which + ]; buildInputs = [ ffmpeg freetype libass libpthreadstubs - lua lua5_sockets libuchardet - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - libiconv Cocoa CoreAudio ]) - ++ optional alsaSupport alsaLib + lua luasocket libuchardet + ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora ++ optional xineramaSupport libXinerama @@ -157,7 +158,10 @@ in stdenv.mkDerivation rec { ++ optional archiveSupport libarchive ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] - ++ optionals waylandSupport [ wayland libxkbcommon ]; + ++ optionals waylandSupport [ wayland libxkbcommon ] + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + libiconv Cocoa CoreAudio + ]); enableParallelBuilding = true; @@ -165,7 +169,14 @@ in stdenv.mkDerivation rec { python3 ${waf} build ''; - installPhase = '' + installPhase = + let + getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" + + "${luasocket}/share/lua/${lua.luaversion}/?.${type}"; + luaPath = getPath "lua"; + luaCPath = getPath "so"; + in + '' python3 ${waf} install # Use a standard font @@ -174,6 +185,8 @@ in stdenv.mkDerivation rec { # Ensure youtube-dl is available in $PATH for MPV wrapProgram $out/bin/mpv \ --add-flags "--scripts=${concatStringsSep "," scripts}" \ + --prefix LUA_PATH : "${luaPath}" \ + --prefix LUA_CPATH : "${luaCPath}" \ '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' @@ -199,5 +212,3 @@ in stdenv.mkDerivation rec { ''; }; } -# TODO: investigate caca support -# TODO: investigate lua5_sockets bug diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 86b8dab7f1f2..aa9643416485 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { name = "openshot-qt-${version}"; - version = "2.3.4"; + version = "2.4.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "026zxvg5mij49g021hipv3hspsx8m5bs4v9pm2axqw6rvszjk90z"; + sha256 = "182dldj9ybs6aqjfrc9dqx1mifdyhv0rf3ifxcp52cm9rz5yv8ml"; }; nativeBuildInputs = [ doxygen wrapGAppsHook ]; diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index a60b5ffc0bbd..9858edf82389 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "peek-${version}"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "phw"; repo = "peek"; rev = version; - sha256 = "04sc6gfrqvnx288rmgsywpjx9l6jcfn2qdbwjcbdvx4wl3gna0qm"; + sha256 = "1ihmq914g2h5iw86bigkkblzqimr50yq6z883lzq656xkcayd8gh"; }; nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ]; diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix new file mode 100644 index 000000000000..5638fad39e5d --- /dev/null +++ b/pkgs/applications/video/screenkey/default.nix @@ -0,0 +1,60 @@ +{ lib +, substituteAll +, buildPythonApplication +, fetchFromGitHub +, distutils_extra +, setuptools-git +, intltool +, pygtk +, libX11 +, libXtst +, wrapGAppsHook +, defaultIconTheme +, hicolor_icon_theme +}: +buildPythonApplication rec { + pname = "screenkey"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "wavexx"; + repo = "screenkey"; + rev = "screenkey-${version}"; + sha256 = "14g7fiv9n7m03djwz1pp5034pffi87ssvss9bc1q8vq0ksn23vrw"; + }; + + patches = [ + (substituteAll { + src = ./paths.patch; + inherit libX11 libXtst; + }) + ]; + + nativeBuildInputs = [ + distutils_extra + setuptools-git + intltool + + wrapGAppsHook + ]; + + buildInputs = [ + defaultIconTheme + hicolor_icon_theme + ]; + + propagatedBuildInputs = [ + pygtk + ]; + + # screenkey does not have any tests + doCheck = false; + + meta = with lib; { + homepage = https://www.thregr.org/~wavexx/software/screenkey/; + description = "A screencast tool to display your keys inspired by Screenflick"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.rasendubi ]; + }; +} diff --git a/pkgs/applications/video/screenkey/paths.patch b/pkgs/applications/video/screenkey/paths.patch new file mode 100644 index 000000000000..7e5ed47fc19d --- /dev/null +++ b/pkgs/applications/video/screenkey/paths.patch @@ -0,0 +1,20 @@ +--- a/Screenkey/xlib.py ++++ b/Screenkey/xlib.py +@@ -6,7 +6,7 @@ + from ctypes import * + + ## base X11 +-libX11 = CDLL('libX11.so.6') ++libX11 = CDLL('@libX11@/lib/libX11.so.6') + + # types + Atom = c_ulong +@@ -278,7 +278,7 @@ + + + ## record extensions +-libXtst = CDLL('libXtst.so.6') ++libXtst = CDLL('@libXtst@/lib/libXtst.so.6') + + # types + XPointer = String \ No newline at end of file |