arcan: 0.6.3.3 -> 0.7.0.1; add ngi team (#456745)
This commit is contained in:
@@ -2,7 +2,6 @@
|
|||||||
lib,
|
lib,
|
||||||
SDL2,
|
SDL2,
|
||||||
callPackage,
|
callPackage,
|
||||||
fetchpatch2,
|
|
||||||
cmake,
|
cmake,
|
||||||
espeak-ng,
|
espeak-ng,
|
||||||
ffmpeg,
|
ffmpeg,
|
||||||
@@ -28,6 +27,7 @@
|
|||||||
libvncserver,
|
libvncserver,
|
||||||
libxcb,
|
libxcb,
|
||||||
libxkbcommon,
|
libxkbcommon,
|
||||||
|
luajit,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
libgbm,
|
libgbm,
|
||||||
mupdf,
|
mupdf,
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
xz,
|
xz,
|
||||||
# Boolean flags
|
# Boolean flags
|
||||||
buildManPages ? true,
|
buildManPages ? true,
|
||||||
useBuiltinLua ? true,
|
useBuiltinLua ? false,
|
||||||
useEspeak ? !stdenv.hostPlatform.isDarwin,
|
useEspeak ? !stdenv.hostPlatform.isDarwin,
|
||||||
useStaticLibuvc ? true,
|
useStaticLibuvc ? true,
|
||||||
useStaticOpenAL ? true,
|
useStaticOpenAL ? true,
|
||||||
@@ -62,14 +62,6 @@
|
|||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
inherit (sources.letoram-arcan) pname version src;
|
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 = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
makeWrapper
|
makeWrapper
|
||||||
@@ -117,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
xcbutilwm
|
xcbutilwm
|
||||||
xz
|
xz
|
||||||
]
|
]
|
||||||
|
++ lib.optionals (!useBuiltinLua) [ luajit ]
|
||||||
++ lib.optionals useEspeak [ espeak-ng ];
|
++ lib.optionals useEspeak [ espeak-ng ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
@@ -206,6 +199,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
lgpl2Plus
|
lgpl2Plus
|
||||||
];
|
];
|
||||||
maintainers = [ ];
|
maintainers = [ ];
|
||||||
|
teams = with lib.teams; [ ngi ];
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
let
|
let
|
||||||
self = {
|
self = {
|
||||||
pname = "arcan";
|
pname = "arcan";
|
||||||
version = "0.6.3.3";
|
version = "0.7.0.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "letoram";
|
owner = "letoram";
|
||||||
repo = "arcan";
|
repo = "arcan";
|
||||||
rev = self.version;
|
tag = self.version;
|
||||||
hash = "sha256-YH3VGU3gSR5gqHnAlA2vrzU8vasKd0hOpc+2ludnV+Y=";
|
hash = "sha256-AbIMZOyEvRQzlmNetImLnBBoSaFUsy4k1NNSO0mI8FI=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
@@ -21,13 +21,13 @@
|
|||||||
|
|
||||||
letoram-openal = {
|
letoram-openal = {
|
||||||
pname = "letoram-openal";
|
pname = "letoram-openal";
|
||||||
version = "0.6.2";
|
version = "0.6.2-unstable-2025-06-26";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "letoram";
|
owner = "letoram";
|
||||||
repo = "openal";
|
repo = "openal";
|
||||||
rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a";
|
rev = "731bdaefeb9cfcc52267bb8fc884248e4420e9ec";
|
||||||
hash = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420=";
|
hash = "sha256-jrgZRekhEiztJ8vodWnCpeYmT54Ei/c27XrD5S98gjk=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user