diff options
Diffstat (limited to 'pkgs/development/lua-modules/lib.nix')
| -rw-r--r-- | pkgs/development/lua-modules/lib.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index 5841547073d39..df5dbc5d30243 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -1,9 +1,9 @@ { pkgs, lib, lua }: let inherit (lib.generators) toLua; - requiredLuaModules = drvs: with lib; let - modules = filter hasLuaModule drvs; - in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); + requiredLuaModules = drvs: let + modules = lib.filter hasLuaModule drvs; + in lib.unique ([lua] ++ modules ++ lib.concatLists (lib.catAttrs "requiredLuaModules" modules)); # Check whether a derivation provides a lua module. hasLuaModule = drv: drv ? luaModule; @@ -93,7 +93,6 @@ rec { externalDeps ? [] # a list of lua derivations , requiredLuaRocks ? [] - , rocksSubdir ? "rocks-subdir" , ... }@args: let rocksTrees = lib.imap0 @@ -124,11 +123,7 @@ rec { (lib.filter (lib.isDerivation) externalDeps); generatedConfig = ({ - local_cache = ""; - # To prevent collisions when creating environments, we install the rock - # files into per-package subdirectories - rocks_subdir = rocksSubdir; # first tree is the default target where new rocks are installed, # any other trees in the list are treated as additional sources of installed rocks for matching dependencies. |