mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-30 16:10:36 +00:00
fityk: use Lua 5.5
Use Lua 5.5 for fityk's embedded scripting instead of Lua 5.2 with compatibility options. fityk 1.3.2's configure only accepts Lua older than 5.5, so apply the upstream commit that widens the version check. It can be dropped with the next release. Assisted-by: Claude Code (Claude Opus 5.5)
This commit is contained in:
@@ -2,10 +2,11 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
autoreconfHook,
|
||||
wxwidgets_3_2,
|
||||
boost186,
|
||||
lua5_2_compat,
|
||||
lua5_5,
|
||||
zlib,
|
||||
bzip2,
|
||||
xylib,
|
||||
@@ -14,7 +15,7 @@
|
||||
swig,
|
||||
}:
|
||||
let
|
||||
lua = lua5_2_compat;
|
||||
lua = lua5_5;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -28,6 +29,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "sha256-m2RaZMYT6JGwa3sOUVsBIzCdZetTbiygaInQWoJ4m1o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Accept Lua 5.5 in configure (https://github.com/wojdyr/fityk/pull/64).
|
||||
# Can be dropped at the next release.
|
||||
(fetchpatch2 {
|
||||
name = "fityk-detect-lua-5.5.patch";
|
||||
url = "https://github.com/wojdyr/fityk/commit/48456231ca58211d7bcde0d2d8ac0c29cae2ab16.patch?full_index=1";
|
||||
hash = "sha256-QkhNnGRuSP0bGqK7GtHfx2OpkEZoz8YI7M2m4f5N1Pw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
lua
|
||||
|
||||
Reference in New Issue
Block a user