Apply suggestions from code review
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
parent
88842910b5
commit
496b8abf78
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
luaEnv = lua.withPackages(ps: [ps.lpeg]);
|
||||
luaEnv = lua.withPackages(ps: [ ps.lpeg ]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vis";
|
||||
|
|
|
@ -12,7 +12,8 @@
|
|||
}:
|
||||
let
|
||||
luaPackages = callPackage ../../lua-modules {
|
||||
lua=self; overrides=packageOverrides;
|
||||
lua = self;
|
||||
overrides = packageOverrides;
|
||||
};
|
||||
|
||||
plat = if stdenv.isLinux then "linux"
|
||||
|
|
|
@ -55,7 +55,7 @@ rec {
|
|||
toLuaModule = drv:
|
||||
drv.overrideAttrs( oldAttrs: {
|
||||
# Use passthru in order to prevent rebuilds when possible.
|
||||
passthru = (oldAttrs.passthru or {})// {
|
||||
passthru = (oldAttrs.passthru or {}) // {
|
||||
luaModule = lua;
|
||||
requiredLuaModules = requiredLuaModules drv.propagatedBuildInputs;
|
||||
};
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
, lua
|
||||
, nixosTests
|
||||
, withLibevent ? true
|
||||
, withDBI ? true, luadbi ? null
|
||||
, withDBI ? true
|
||||
# use withExtraLibs to add additional dependencies of community modules
|
||||
, withExtraLibs ? [ ]
|
||||
, withOnlyInstalledCommunityModules ? [ ]
|
||||
|
@ -12,7 +12,7 @@ with lib;
|
|||
|
||||
|
||||
let
|
||||
luaEnv = lua.withPackages(p: with p;[
|
||||
luaEnv = lua.withPackages(p: with p; [
|
||||
luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3
|
||||
]
|
||||
++ lib.optional withLibevent p.luaevent
|
||||
|
|
|
@ -107,7 +107,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
vicious = toLuaModule( stdenv.mkDerivation rec {
|
||||
vicious = luaLib.toLuaModule( stdenv.mkDerivation rec {
|
||||
pname = "vicious";
|
||||
version = "2.5.0";
|
||||
|
||||
|
|
Loading…
Reference in a new issue