diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-04-15 07:16:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-04-15 07:17:32 +0200 |
| commit | 3bcf0470d807c0d87c5e3cefb49c21b02f00c417 (patch) | |
| tree | c4b0265fc340a1458cbcf579c07e255e29645a1c /pkgs/development/interpreters/lua-5 | |
| parent | be88b5527df987a7a73792c4474b8b26402e8c98 (diff) | |
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
Diffstat (limited to 'pkgs/development/interpreters/lua-5')
| -rw-r--r-- | pkgs/development/interpreters/lua-5/build-luarocks-package.nix | 10 |
1 files 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 0040fca0ba2c7..97ac535c93036 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 |