diff options
author | wyvie <elijahrum@gmail.com> | 2014-09-23 18:01:02 +0400 |
---|---|---|
committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-09-30 07:42:19 +0100 |
commit | d4b7910f80267613017baa7388a9c39ab7a722fb (patch) | |
tree | 09cada3e14d45ee18fc7bc167bc67ae373a0854b /pkgs/games/mudlet | |
parent | 134e74dbc7c6a1eb7c92dfd1ad23b7ab69ca78c9 (diff) | |
download | nixlib-d4b7910f80267613017baa7388a9c39ab7a722fb.tar nixlib-d4b7910f80267613017baa7388a9c39ab7a722fb.tar.gz nixlib-d4b7910f80267613017baa7388a9c39ab7a722fb.tar.bz2 nixlib-d4b7910f80267613017baa7388a9c39ab7a722fb.tar.lz nixlib-d4b7910f80267613017baa7388a9c39ab7a722fb.tar.xz nixlib-d4b7910f80267613017baa7388a9c39ab7a722fb.tar.zst nixlib-d4b7910f80267613017baa7388a9c39ab7a722fb.zip |
Added more lua modules to lua-packages, added them as dependencies for
mudlet Closes #4269
Diffstat (limited to 'pkgs/games/mudlet')
-rw-r--r-- | pkgs/games/mudlet/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 2766521f7b35..fd8948276f1b 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, pkgs, stdenv, makeWrapper, qt5, yajl, libzip, hunspell, lua5_1, boost, filesystem }: +{ fetchurl, pkgs, stdenv, makeWrapper, qt5, yajl, libzip, hunspell, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3 }: stdenv.mkDerivation rec { name = "mudlet-${version}"; @@ -9,19 +9,23 @@ stdenv.mkDerivation rec { sha256 = "c7b9a383d2cf393da730ce07ac8f06478eaec1fdf730054e837e58c598222d38"; }; - buildInputs = [ pkgs.unzip qt5 lua5_1 hunspell libzip yajl boost makeWrapper filesystem ]; + buildInputs = [ pkgs.unzip qt5 lua5_1 hunspell libzip yajl boost makeWrapper luafilesystem luazip lrexlib luasqlite3 ]; configurePhase = "cd src && qmake"; - installPhase = '' - mkdir -pv $out + installPhase = let + luaZipPath = "${luazip}/lib/lua/5.1/?.so"; + luaFileSystemPath = "${luafilesystem}/lib/lua/5.1/?.so"; + lrexlibPath = "${lrexlib}/lib/lua/5.1/?.so"; + luasqlitePath = "${luasqlite3}/lib/lua/5.1/?.so"; + in '' mkdir -pv $out/bin cp mudlet $out cp -r mudlet-lua $out - # ln -s $out/mudlet $out/bin/mudlet makeWrapper $out/mudlet $out/bin/mudlet \ - --set LUA_CPATH "${filesystem}/lib/lua/5.1/?.so" + --set LUA_CPATH "\"${luaFileSystemPath};${luaZipPath};${lrexlibPath};${luasqlitePath}\"" \ + --run "cd $out"; ''; patches = [ ./libs.patch ]; |