colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lua: use finalAttrs for interpreters (#264381)

Browse Source
This commit is contained in:
Matthieu Coudron 2023-11-23 10:19:14 +01:00 committed by GitHub
parent 291192ede8
commit 79245fc3e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/interpreters/lua-5/interpreter.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv, fetchurl, readline { lib, stdenv, fetchurl, readline
, compat ? false , compat ? false
, callPackage
, makeWrapper , makeWrapper
, self , self
, packageOverrides ? (final: prev: {}) , packageOverrides ? (final: prev: {})
@ -18,6 +17,8 @@
, staticOnly ? stdenv.hostPlatform.isStatic , staticOnly ? stdenv.hostPlatform.isStatic
, luaAttr ? "lua${lib.versions.major version}_${lib.versions.minor version}" , luaAttr ? "lua${lib.versions.major version}_${lib.versions.minor version}"
} @ inputs: } @ inputs:
stdenv.mkDerivation (finalAttrs:
let let
luaPackages = self.pkgs; luaPackages = self.pkgs;
@ -38,18 +39,20 @@ compatFlags = if (lib.versionOlder self.luaversion "5.3") then " -DLUA_COMPAT_AL
else " -DLUA_COMPAT_5_3"; else " -DLUA_COMPAT_5_3";
in in
stdenv.mkDerivation rec { {
pname = "lua"; pname = "lua";
inherit version; inherit version;
src = fetchurl { 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; sha256 = hash;
}; };
LuaPathSearchPaths = luaPackages.luaLib.luaPathList; LuaPathSearchPaths = luaPackages.luaLib.luaPathList;
LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList; LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList;
setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; setupHook = luaPackages.lua-setup-hook
finalAttrs.LuaPathSearchPaths
finalAttrs.LuaCPathSearchPaths;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ readline ]; buildInputs = [ readline ];
@ -163,4 +166,4 @@ stdenv.mkDerivation rec {
license = lib.licenses.mit; license = lib.licenses.mit;
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} })

2
pkgs/development/interpreters/luajit/default.nix
View File

@ -1,11 +1,9 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub
, buildPackages , buildPackages
, version , version
, src , src
, extraMeta ? { } , extraMeta ? { }
, callPackage
, self , self
, packageOverrides ? (final: prev: {}) , packageOverrides ? (final: prev: {})
, pkgsBuildBuild , pkgsBuildBuild