diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2019-02-17 21:18:49 +0900 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-03-07 10:34:01 +0000 |
| commit | ed7818219a70bc897463c1ece9d7abfa723c87f0 (patch) | |
| tree | f9b82d799b2c96575aa247c0d640d7a0e271f011 /pkgs/development/interpreters | |
| parent | b93ccb71366c98d14f6c720cdfca6d5c8150118b (diff) | |
| download | nixlib-ed7818219a70bc897463c1ece9d7abfa723c87f0.tar nixlib-ed7818219a70bc897463c1ece9d7abfa723c87f0.tar.gz nixlib-ed7818219a70bc897463c1ece9d7abfa723c87f0.tar.bz2 nixlib-ed7818219a70bc897463c1ece9d7abfa723c87f0.tar.lz nixlib-ed7818219a70bc897463c1ece9d7abfa723c87f0.tar.xz nixlib-ed7818219a70bc897463c1ece9d7abfa723c87f0.tar.zst nixlib-ed7818219a70bc897463c1ece9d7abfa723c87f0.zip | |
lua: run postConfigure hook for rock and rockspec
it was previously run only for src.rock
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/lua-5/build-lua-package.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 0bed5efe4f79..b1175c2fa459 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -3,8 +3,6 @@ , lua , stdenv , wrapLua -, unzip -, writeText # Whether the derivation provides a lua module or not. , toLuaModule }: @@ -117,14 +115,16 @@ builtins.removeAttrs attrs ["disabled" "checkInputs"] // { cat > ${luarocks_config} <<EOF ${luarocks_content} EOF - export LUAROCKS_CONFIG=$PWD/${luarocks_config}; + export LUAROCKS_CONFIG="$PWD/${luarocks_config}"; '' + lib.optionalString (knownRockspec != null) '' # prevents the following type of error: # Inconsistency between rockspec filename (42fm1b3d7iv6fcbhgm9674as3jh6y2sh-luv-1.22.0-1.rockspec) and its contents (luv-1.22.0-1.rockspec) rockspecFilename="$TMP/$(stripHash ''${knownRockspec})" - cp ''${knownRockspec} $rockspecFilename + cp ''${knownRockspec} "$rockspecFilename" + '' + + '' runHook postConfigure ''; |