Unverified Commit 79245fc3 authored by Matthieu Coudron's avatar Matthieu Coudron Committed by GitHub
Browse files

lua: use finalAttrs for interpreters (#264381)

parent 291192ed

pkgs/development/interpreters/lua-5/interpreter.nix

+30 −27
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, readline

, compat ? false

, callPackage

, makeWrapper

, self

, packageOverrides ? (final: prev: {})
@@ -18,6 +17,8 @@ 
, staticOnly ? stdenv.hostPlatform.isStatic

, luaAttr ? "lua${lib.versions.major version}_${lib.versions.minor version}"

} @ inputs:



stdenv.mkDerivation (finalAttrs:

  let

    luaPackages = self.pkgs;
@@ -38,18 +39,20 @@ compatFlags = if (lib.versionOlder self.luaversion "5.3") then " -DLUA_COMPAT_AL 
                  else " -DLUA_COMPAT_5_3";

  in



stdenv.mkDerivation rec {

  {

  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;

  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;

  };

}
 
})

pkgs/development/interpreters/luajit/default.nix

+0 −2
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, buildPackages

, version

, src

, extraMeta ? { }

, callPackage

, self

, packageOverrides ? (final: prev: {})

, pkgsBuildBuild