diff options
Diffstat (limited to 'pkgs/applications/video')
9 files changed, 37 insertions, 18 deletions
diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index fd9ef652dbea4..90993a91e45fd 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -51,9 +51,7 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/celluloid-player/celluloid"; diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index ba959ec5717e1..91ead29833b1a 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -20,19 +20,19 @@ stdenv.mkDerivation rec { pname = "kooha"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - hash = "sha256-HgouIMbwpmR/K1hPU7QDzeEtyi5hC66huvInkJFLS2w="; + hash = "sha256-vLgBuP0DncBIb05R3484WozS+Nl+S7YBJUYek2CkJkQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-rdxD9pys11QcUtufcZ/zCrviytyc8hIXJfsXg2JoaKE="; + hash = "sha256-NPh603/5yZDUdTegAzFvjRn5tuzyrcNzbbKQr6NxXso="; }; nativeBuildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Simple screen recorder"; + description = "Elegantly record your screen"; homepage = "https://github.com/SeaDve/Kooha"; license = licenses.gpl3Only; platforms = platforms.linux; diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index 73354644b5e43..ddec8efb6a412 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "motion"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "Motion-Project"; repo = "motion"; rev = "release-${version}"; - sha256 = "sha256-uKEgTQhpslOCfNj8z95/DK4M1Gx4SMRjl1/KPh5KHuc="; + sha256 = "sha256-3TmmLAU/muiI90hrYrctzgVbWS4rXjxzAa0ctVYKSSY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index b43ce6afdff8b..0c46b4c2ba858 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -42,7 +42,6 @@ stdenvNoCC.mkDerivation { passthru = { scriptName = "sponsorblock.lua"; updateScript = nix-update-script { - attrPath = "mpvScripts.sponsorblock"; extraArgs = [ "--version=branch" ]; }; }; diff --git a/pkgs/applications/video/netflix/default.nix b/pkgs/applications/video/netflix/default.nix index 4f44ddebaef4f..8c50e027c0e20 100644 --- a/pkgs/applications/video/netflix/default.nix +++ b/pkgs/applications/video/netflix/default.nix @@ -5,6 +5,9 @@ , runtimeShell , symlinkJoin , writeScriptBin + + # command line arguments which are always set e.g "--disable-gpu" +, commandLineArgs ? [ ] }: let @@ -43,9 +46,12 @@ let script = writeScriptBin name '' #!${runtimeShell} - exec ${google-chrome}/bin/${google-chrome.meta.mainProgram} \ + exec ${google-chrome}/bin/${google-chrome.meta.mainProgram} ${lib.escapeShellArgs commandLineArgs} \ --app=https://netflix.com \ - --no-first-run --no-default-browser-check --no-crash-upload + --no-first-run \ + --no-default-browser-check \ + --no-crash-upload \ + "$@" ''; in diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index bf77e8a8f0da1..438eae4670980 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , alsa-lib , cmake , doxygen @@ -28,6 +29,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-XtwTZsj/L/sw/28E7Qr5UyghGlBFFXvbmZLGXBB8vg0="; }; + patches = [ + # https://forum.juce.com/t/juce-and-macos-11-arm/40285/24 + ./undef-fpret-on-aarch64-darwin.patch + ]; + nativeBuildInputs = [ cmake doxygen @@ -63,7 +69,5 @@ stdenv.mkDerivation rec { license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 8a98010ef642b..22ed82fd3d0b7 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -35,8 +35,9 @@ stdenv.mkDerivation rec { export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; - nativeBuildInputs = [ + nativeBuildInputs = lib.optionals stdenv.isLinux [ alsa-lib + ] ++ [ cmake doxygen pkg-config diff --git a/pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch b/pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch new file mode 100644 index 0000000000000..c391f77dda8b7 --- /dev/null +++ b/pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h +index 2593790..0b5983d 100644 +--- a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h ++++ b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h +@@ -209,7 +209,7 @@ static inline ReturnValue ObjCMsgSendSuper (struct objc_super* s, SEL sel, Param + typedef id (*MsgSendSuperFn) (struct objc_super*, SEL, ...); + static inline MsgSendSuperFn getMsgSendSuperFn() noexcept { return (MsgSendSuperFn) (void*) objc_msgSendSuper; } + +-#if ! JUCE_IOS ++#if JUCE_INTEL && ! JUCE_IOS + typedef double (*MsgSendFPRetFn) (id, SEL op, ...); + static inline MsgSendFPRetFn getMsgSendFPRetFn() noexcept { return (MsgSendFPRetFn) (void*) objc_msgSend_fpret; } + #endif diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index c39363ee36357..f2b5f6c504ab9 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -79,9 +79,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; |