summary refs log tree commit diff
path: root/pkgs/games/mudlet
diff options
context:
space:
mode:
authorAlexei Robyn <shados@shados.net>2019-06-13 21:01:10 +1000
committerAlexei Robyn <shados@shados.net>2019-06-14 13:17:15 +1000
commit274715cbc355e9d50e07a2f60a65a183f7d9855d (patch)
tree52131c594bc72a6a8d07fd64f45ad9ec82fdbe33 /pkgs/games/mudlet
parent8eabbb3d205541a33658779dc70dc217d3161ed2 (diff)
downloadnixpkgs-274715cbc355e9d50e07a2f60a65a183f7d9855d.tar
nixpkgs-274715cbc355e9d50e07a2f60a65a183f7d9855d.tar.gz
nixpkgs-274715cbc355e9d50e07a2f60a65a183f7d9855d.tar.bz2
nixpkgs-274715cbc355e9d50e07a2f60a65a183f7d9855d.tar.lz
nixpkgs-274715cbc355e9d50e07a2f60a65a183f7d9855d.tar.xz
nixpkgs-274715cbc355e9d50e07a2f60a65a183f7d9855d.tar.zst
nixpkgs-274715cbc355e9d50e07a2f60a65a183f7d9855d.zip
luaPackages: Replace all rockspec packages with generated ones
luaPackages replaced by generated ones:
- bit32
- compat53
- cqueues
- luacyrussasl -> cyrussasl (luarocks name)
- luaexpat
- luadbi -> luadbi front-end module + separate backend modules
  luadbi-{mysql,postgresql,sqlite3}
- luafilesystem
- luaossl
- luasec
- luasocket
- luastdlib -> stdlib (luarocks name)
- lrexlib -> lrexlib-pcre (we already have lrexlib-gnu and
  lrexlib-posix, lrexlib-pcre however appears to be the variant used in
  mudlet, which is the only current dep in nixpkgs)
- luasqlite -> luasql-sqlite3 (luarocks name)
- lfs -> luafilesytem (we literally had two manually written
  luafilesystem expressions, under different names)

Changes and additions to overrides to generated luarocks packgaes,
including:
- busted: Install bash completions along with the zsh ones
- cqueues:
    - Perform minor surgery on the rockspec to allow using a single
      rockspec to build for all supported Lua versions
    - Add a patch by @vcunat to work around a build issue
- luuid: Wrote a tiny patch to allow for Lua 5.1/Luajit compatibility
- General changes:
    - Sorted the packages
    - Attempted to make the formatting consistent
    - Preferenced `.override` instead of `.overrideAttrs` wherever
      possible

Minor changes to other packages to adjust for the Lua package changes:
- luakit expression simplified
- prosody expression simplified; but users will now need to specify the
  luadbi backend module they intend to use in withExtraLibs
- knot-resolver inputs correctd
- mudlet inputs corrected (although this package was and should still be
  broken)
Diffstat (limited to 'pkgs/games/mudlet')
-rw-r--r--pkgs/games/mudlet/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index 673efb0e118..dab83ddc900 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, unzip, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell
-, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmake }:
+, boost, lua5_1, luafilesystem, luazip, lrexlib-pcre, luasql-sqlite3, qmake }:
 
 stdenv.mkDerivation rec {
   name = "mudlet-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper qmake ];
   buildInputs = [
     unzip qtbase lua5_1 hunspell libzip yajl boost
-    luafilesystem luazip lrexlib luasqlite3
+    luafilesystem luazip lrexlib-pcre luasql-sqlite3
   ];
 
   preConfigure = "cd src";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
   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";
+    lrexlibPath = "${lrexlib-pcre}/lib/lua/5.1/?.so";
+    luasqlitePath = "${luasql-sqlite3}/lib/lua/5.1/?.so";
   in ''
     mkdir -pv $out/bin
     cp mudlet $out