pyrox.dev
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
+3
-7
pkgs/development/interpreters/lua-5/build-luarocks-package.nix
+3
-7
pkgs/development/interpreters/lua-5/build-luarocks-package.nix
···
94
94
];
95
95
96
96
inherit doCheck extraConfig rockspecFilename knownRockspec externalDeps nativeCheckInputs;
97
-
inherit dontWrapLuaPrograms;
98
97
99
98
buildInputs = let
100
99
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
···
178
177
runHook postBuild
179
178
'';
180
179
181
-
fixupPhase = ''
182
-
runHook preFixup
183
-
${lib.optionalString (!self.dontWrapLuaPrograms) "wrapLuaPrograms"}
184
-
runHook postFixup
185
-
'';
180
+
postFixup = lib.optionalString (!dontWrapLuaPrograms) ''
181
+
wrapLuaPrograms
182
+
'' + attrs.postFixup or "";
186
183
187
184
installPhase = ''
188
185
runHook preInstall
···
199
196
# maybe we could reestablish dependency checking via passing --rock-trees
200
197
201
198
nix_debug "ROCKSPEC $rockspecFilename"
202
-
# deps-mode=all tells luarocks to use every configured rocks_trees
203
199
luarocks $LUAROCKS_EXTRA_ARGS make --deps-mode=all --tree=$out ''${rockspecFilename}
204
200
205
201
runHook postInstall