Revert #303176: "buildLuarocksPackage: rework fixup phase"

This reverts commit ddefcf284c.
Breakages need figuring out, reverting for now:
https://github.com/NixOS/nixpkgs/pull/303176#issuecomment-2053910614
This commit is contained in:
Vladimír Čunát 2024-04-15 07:16:44 +02:00
parent be88b5527d
commit 3bcf0470d8
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 7 deletions

View File

@ -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