diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix index 8be48491c5bb..0f723a613e20 100644 --- a/pkgs/by-name/ar/arcan/package.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -2,7 +2,6 @@ lib, SDL2, callPackage, - fetchpatch2, cmake, espeak-ng, ffmpeg, @@ -28,6 +27,7 @@ libvncserver, libxcb, libxkbcommon, + luajit, makeWrapper, libgbm, mupdf, @@ -48,7 +48,7 @@ xz, # Boolean flags buildManPages ? true, - useBuiltinLua ? true, + useBuiltinLua ? false, useEspeak ? !stdenv.hostPlatform.isDarwin, useStaticLibuvc ? true, useStaticOpenAL ? true, @@ -62,14 +62,6 @@ stdenv.mkDerivation (finalAttrs: { inherit (sources.letoram-arcan) pname version src; - patches = [ - # (encode) remove deprecated use of pts/channel-layout - (fetchpatch2 { - url = "https://github.com/letoram/arcan/commit/e717c1b5833bdc2dea7dc6f64eeaf39c683ebd26.patch?full_index=1"; - hash = "sha256-nUmOWfphGtGiLehUa78EJWqTlD7SvqJgl8lnn90vTFU="; - }) - ]; - nativeBuildInputs = [ cmake makeWrapper @@ -117,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: { xcbutilwm xz ] + ++ lib.optionals (!useBuiltinLua) [ luajit ] ++ lib.optionals useEspeak [ espeak-ng ]; cmakeFlags = [ @@ -206,6 +199,7 @@ stdenv.mkDerivation (finalAttrs: { lgpl2Plus ]; maintainers = [ ]; + teams = with lib.teams; [ ngi ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ar/arcan/sources.nix b/pkgs/by-name/ar/arcan/sources.nix index fbc7645a1bf2..8197cc1fb668 100644 --- a/pkgs/by-name/ar/arcan/sources.nix +++ b/pkgs/by-name/ar/arcan/sources.nix @@ -7,13 +7,13 @@ let self = { pname = "arcan"; - version = "0.6.3.3"; + version = "0.7.0.1"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = self.version; - hash = "sha256-YH3VGU3gSR5gqHnAlA2vrzU8vasKd0hOpc+2ludnV+Y="; + tag = self.version; + hash = "sha256-AbIMZOyEvRQzlmNetImLnBBoSaFUsy4k1NNSO0mI8FI="; }; }; in @@ -21,13 +21,13 @@ letoram-openal = { pname = "letoram-openal"; - version = "0.6.2"; + version = "0.6.2-unstable-2025-06-26"; src = fetchFromGitHub { owner = "letoram"; repo = "openal"; - rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a"; - hash = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420="; + rev = "731bdaefeb9cfcc52267bb8fc884248e4420e9ec"; + hash = "sha256-jrgZRekhEiztJ8vodWnCpeYmT54Ei/c27XrD5S98gjk="; }; };