mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-11 07:15:54 +03:00
lua: use finalAttrs for interpreters (#264381)
This commit is contained in:
parent
291192ede8
commit
79245fc3e7
@ -1,6 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, readline
|
||||
, compat ? false
|
||||
, callPackage
|
||||
, makeWrapper
|
||||
, self
|
||||
, packageOverrides ? (final: prev: {})
|
||||
@ -18,38 +17,42 @@
|
||||
, staticOnly ? stdenv.hostPlatform.isStatic
|
||||
, luaAttr ? "lua${lib.versions.major version}_${lib.versions.minor version}"
|
||||
} @ inputs:
|
||||
let
|
||||
luaPackages = self.pkgs;
|
||||
|
||||
luaversion = lib.versions.majorMinor version;
|
||||
stdenv.mkDerivation (finalAttrs:
|
||||
let
|
||||
luaPackages = self.pkgs;
|
||||
|
||||
plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux"
|
||||
else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline"
|
||||
else if stdenv.isDarwin then "macosx"
|
||||
else if stdenv.hostPlatform.isMinGW then "mingw"
|
||||
else if stdenv.isFreeBSD then "freebsd"
|
||||
else if stdenv.isSunOS then "solaris"
|
||||
else if stdenv.hostPlatform.isBSD then "bsd"
|
||||
else if stdenv.hostPlatform.isUnix then "posix"
|
||||
else "generic";
|
||||
luaversion = lib.versions.majorMinor version;
|
||||
|
||||
compatFlags = if (lib.versionOlder self.luaversion "5.3") then " -DLUA_COMPAT_ALL"
|
||||
else if (lib.versionOlder self.luaversion "5.4") then " -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2"
|
||||
else " -DLUA_COMPAT_5_3";
|
||||
in
|
||||
plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux"
|
||||
else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline"
|
||||
else if stdenv.isDarwin then "macosx"
|
||||
else if stdenv.hostPlatform.isMinGW then "mingw"
|
||||
else if stdenv.isFreeBSD then "freebsd"
|
||||
else if stdenv.isSunOS then "solaris"
|
||||
else if stdenv.hostPlatform.isBSD then "bsd"
|
||||
else if stdenv.hostPlatform.isUnix then "posix"
|
||||
else "generic";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
compatFlags = if (lib.versionOlder self.luaversion "5.3") then " -DLUA_COMPAT_ALL"
|
||||
else if (lib.versionOlder self.luaversion "5.4") then " -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2"
|
||||
else " -DLUA_COMPAT_5_3";
|
||||
in
|
||||
|
||||
{
|
||||
pname = "lua";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.lua.org/ftp/${pname}-${version}.tar.gz";
|
||||
url = "https://www.lua.org/ftp/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
|
||||
sha256 = hash;
|
||||
};
|
||||
|
||||
LuaPathSearchPaths = luaPackages.luaLib.luaPathList;
|
||||
LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList;
|
||||
setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths;
|
||||
LuaPathSearchPaths = luaPackages.luaLib.luaPathList;
|
||||
LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList;
|
||||
setupHook = luaPackages.lua-setup-hook
|
||||
finalAttrs.LuaPathSearchPaths
|
||||
finalAttrs.LuaCPathSearchPaths;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ readline ];
|
||||
@ -163,4 +166,4 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -1,11 +1,9 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildPackages
|
||||
, version
|
||||
, src
|
||||
, extraMeta ? { }
|
||||
, callPackage
|
||||
, self
|
||||
, packageOverrides ? (final: prev: {})
|
||||
, pkgsBuildBuild
|
||||
|
Loading…
Reference in New Issue
Block a user