From 4a53aba96852f06d26e47d43c1a3ac9852c0a2ed Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 15 Jul 2022 01:58:11 +0300 Subject: [PATCH] Revert "luarocks: fix cross-compiling" it introduces the wrong lua version and the output will depend on it to fix splicing the lua infra has to be reworked This reverts commit a42a1cbc19d6d54fe392bb66a31b642449021eb9. --- pkgs/development/tools/misc/luarocks/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 4e486e9d24fd..70df08af2de0 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -1,5 +1,4 @@ {lib, stdenv, fetchFromGitHub -, buildPackages , curl, makeWrapper, which, unzip , lua # for 'luarocks pack' @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { fi ''; - nativeBuildInputs = [ makeWrapper installShellFiles buildPackages.lua ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = [ lua curl which ]; @@ -64,7 +63,7 @@ stdenv.mkDerivation rec { installShellCompletion --cmd luarocks --zsh <($out/bin/luarocks completion zsh) ''; - propagatedNativeBuildInputs = [ zip unzip cmake ]; + propagatedBuildInputs = [ zip unzip cmake ]; # unpack hook for src.rock and rockspec files setupHook = ./setup-hook.sh;