public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86075 from teto/mpack

Browse Source 
minor tweaks to develop on luaPackages.mpack
This commit is contained in:
Matthieu Coudron 2020-05-17 23:40:46 +02:00 committed by GitHub
commit 66c04a191e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libmpack/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "libmpack"; pname = "libmpack";
version = "1.0.5"; version = "1.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tarruda"; owner = "libmpack";
repo = "libmpack"; repo = "libmpack";
rev = version; rev = version;
sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2";

6
pkgs/development/lua-modules/overrides.nix
View File

@ -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({ rapidjson = super.rapidjson.override({
preBuild = '' preBuild = ''