diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-08-14 02:49:53 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2023-08-14 02:51:10 +0300 |
commit | cbc8aa437c44c510b54c664364dbfbcd98ac5f18 (patch) | |
tree | ae1007b5847b91704edd9ab87458d8b5c3374f11 /pkgs/development/interpreters/lua-5 | |
parent | a1fdbae706c846f01c31bbe02cb8246fa348b480 (diff) |
treewide: use uncurried version of makeScopeWithSplicing
Diffstat (limited to 'pkgs/development/interpreters/lua-5')
-rw-r--r-- | pkgs/development/interpreters/lua-5/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index f4c622515d7d9..51d44e7f1e0ff 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -23,7 +23,7 @@ let # - imports lua-packages.nix # - adds spliced package sets to the package set # - applies overrides from `packageOverrides` - ({ lua, overrides, callPackage, makeScopeWithSplicing }: let + ({ lua, overrides, callPackage, makeScopeWithSplicing' }: let luaPackagesFun = callPackage ../../../top-level/lua-packages.nix { lua = self; }; @@ -39,18 +39,15 @@ let selfHostHost = luaOnHostForHost.pkgs; selfTargetTarget = luaOnTargetForTarget.pkgs or {}; }; - keep = self: { }; - extra = spliced0: {}; extensions = lib.composeManyExtensions [ generatedPackages overriddenPackages overrides ]; - in makeScopeWithSplicing - otherSplices - keep - extra - (lib.extends extensions luaPackagesFun)) + in makeScopeWithSplicing' { + inherit otherSplices; + f = lib.extends extensions luaPackagesFun; + }) { overrides = packageOverrides; lua = self; |