From a13d38708998938c8f95e35292ef2ace24108a54 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 24 Aug 2022 23:44:04 +0300 Subject: [PATCH] build-lua-package: remove unnecessary adding of buildInputs to nativeBuildInputs and move externalDeps' back to buildInputs both accidentally caused in https://github.com/NixOS/nixpkgs/pull/178158/files --- .../interpreters/lua-5/build-lua-package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 918bca238639..b69c7443e7ec 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -117,11 +117,11 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab nativeBuildInputs = [ wrapLua luarocks - ] - ++ buildInputs - ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ checkInputs) - ++ (map (d: d.dep) externalDeps') - ; + ] ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ checkInputs); + + buildInputs = buildInputs + ++ (map (d: d.dep) externalDeps'); + # propagate lua to active setup-hook in nix-shell propagatedBuildInputs = propagatedBuildInputs ++ [ lua ];