diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2020-05-17 23:40:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-17 23:40:46 +0200 |
| commit | 66c04a191ec6f08112a533dbb7e65c8447434fbc (patch) | |
| tree | 0684c784c2c850e3d3b753af7d1290577eb682fb | |
| parent | 79083b4b75da0b3ec799e7e699d349fcecea77bb (diff) | |
| parent | 9a3d12e2aba4432b53d8ce40bdd8e1cf4d2c6e22 (diff) | |
| download | nixpkgs-66c04a191ec6f08112a533dbb7e65c8447434fbc.tar nixpkgs-66c04a191ec6f08112a533dbb7e65c8447434fbc.tar.gz nixpkgs-66c04a191ec6f08112a533dbb7e65c8447434fbc.tar.bz2 nixpkgs-66c04a191ec6f08112a533dbb7e65c8447434fbc.tar.lz nixpkgs-66c04a191ec6f08112a533dbb7e65c8447434fbc.tar.xz nixpkgs-66c04a191ec6f08112a533dbb7e65c8447434fbc.tar.zst nixpkgs-66c04a191ec6f08112a533dbb7e65c8447434fbc.zip | |
Merge pull request #86075 from teto/mpack
minor tweaks to develop on luaPackages.mpack
| -rw-r--r-- | pkgs/development/libraries/libmpack/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 6 |
2 files changed, 7 insertions, 1 deletions
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"; 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 = '' |