diff options
| author | Matthieu Coudron <teto@users.noreply.github.com> | 2021-09-12 18:08:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-12 18:08:53 +0200 |
| commit | ab9c7819fe57fbdbe352b9858497d21c7083d54c (patch) | |
| tree | fd63cfcb343d07afd5d5989776a28950ee085fd1 /pkgs/games | |
| parent | 3ca823aa9a102d16fe686b63103cb885747eec3b (diff) | |
| parent | b97977681eec4233bcc0428ccdd93a038f810ebf (diff) | |
| download | nixpkgs-ab9c7819fe57fbdbe352b9858497d21c7083d54c.tar nixpkgs-ab9c7819fe57fbdbe352b9858497d21c7083d54c.tar.gz nixpkgs-ab9c7819fe57fbdbe352b9858497d21c7083d54c.tar.bz2 nixpkgs-ab9c7819fe57fbdbe352b9858497d21c7083d54c.tar.lz nixpkgs-ab9c7819fe57fbdbe352b9858497d21c7083d54c.tar.xz nixpkgs-ab9c7819fe57fbdbe352b9858497d21c7083d54c.tar.zst nixpkgs-ab9c7819fe57fbdbe352b9858497d21c7083d54c.zip | |
Merge pull request #136615 from teto/lua-flat
Various lua changes/cleanup
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/mudlet/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 139baece4a6..9d8898b119e 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -2,7 +2,9 @@ , boost, libGLU, lua, cmake, which, pkg-config, }: let - luaEnv = lua.withPackages(ps: with ps; [ luazip luafilesystem lrexlib-pcre luasql-sqlite3 lua-yajl luautf8 ]); + luaEnv = lua.withPackages(ps: with ps; [ + luazip luafilesystem lrexlib-pcre luasql-sqlite3 lua-yajl luautf8 + ]); in stdenv.mkDerivation rec { pname = "mudlet"; @@ -39,8 +41,6 @@ stdenv.mkDerivation rec { cp -r ../mudlet.png $out/share/pixmaps/ makeQtWrapper $out/mudlet $out/bin/mudlet \ - --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ - --prefix LUA_PATH : "$NIX_LUA_PATH" \ --prefix LD_LIBRARY_PATH : "${libsForQt5.qtkeychain}/lib/" \ --run "cd $out"; ''; |