From 3bcf0470d807c0d87c5e3cefb49c21b02f00c417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 15 Apr 2024 07:16:44 +0200 Subject: [PATCH] Revert #303176: "buildLuarocksPackage: rework fixup phase" This reverts commit ddefcf284ce57b2ebe042eba75feec70cfb19268. Breakages need figuring out, reverting for now: https://github.com/NixOS/nixpkgs/pull/303176#issuecomment-2053910614 --- .../interpreters/lua-5/build-luarocks-package.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 0040fca0ba2c..97ac535c9303 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -94,7 +94,6 @@ let ]; inherit doCheck extraConfig rockspecFilename knownRockspec externalDeps nativeCheckInputs; - inherit dontWrapLuaPrograms; buildInputs = let # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] @@ -178,11 +177,9 @@ let runHook postBuild ''; - fixupPhase = '' - runHook preFixup - ${lib.optionalString (!self.dontWrapLuaPrograms) "wrapLuaPrograms"} - runHook postFixup - ''; + postFixup = lib.optionalString (!dontWrapLuaPrograms) '' + wrapLuaPrograms + '' + attrs.postFixup or ""; installPhase = '' runHook preInstall @@ -199,7 +196,6 @@ let # maybe we could reestablish dependency checking via passing --rock-trees nix_debug "ROCKSPEC $rockspecFilename" - # deps-mode=all tells luarocks to use every configured rocks_trees luarocks $LUAROCKS_EXTRA_ARGS make --deps-mode=all --tree=$out ''${rockspecFilename} runHook postInstall