From a5e6e5c170e19dc4e674f8f46f237c9eb18450f4 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Sun, 26 Apr 2020 21:25:42 +0200
Subject: [PATCH 1/2] libmpack: fix source url

Repository was moved to an organization.
---
 pkgs/development/libraries/libmpack/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix
index cdc45956e7a..736474d29a5 100644
--- a/pkgs/development/libraries/libmpack/default.nix
+++ b/pkgs/development/libraries/libmpack/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "libmpack";
   version = "1.0.5";
   src = fetchFromGitHub {
-    owner = "tarruda";
+    owner = "libmpack";
     repo = "libmpack";
     rev = version;
     sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2";

From 9a3d12e2aba4432b53d8ce40bdd8e1cf4d2c6e22 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Sun, 26 Apr 2020 21:28:40 +0200
Subject: [PATCH 2/2] luaPackages.mpack: use system mpack

the luarocks package uses the builtin command and discards the Makefile.
While using the makefile one needs to set some more flags.
---
 pkgs/development/lua-modules/overrides.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index cb429e59c92..84a15e8a674 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -294,6 +294,12 @@ with super;
     };
   });
 
+  mpack = super.mpack.override({
+    buildInputs = [ pkgs.libmpack ];
+    # the rockspec doesn't use the makefile so you may need to export more flags
+    USE_SYSTEM_LUA = "yes";
+    USE_SYSTEM_MPACK = "yes";
+  });
 
   rapidjson = super.rapidjson.override({
     preBuild = ''