mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 21:18:28 +03:00
Merge pull request #31764 from adisbladis/libmsgpack-gcc7
Libmsgpack gcc7 fixes
This commit is contained in:
commit
e283833d9c
@ -1,12 +0,0 @@
|
||||
{ callPackage, fetchFromGitHub, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msgpack";
|
||||
repo = "msgpack-c";
|
||||
rev = "cpp-${version}";
|
||||
sha256 = "0zlanifi5hmm303pzykpidq5jbapl891zwkwhkllfn8ab1jvzbaa";
|
||||
};
|
||||
})
|
@ -1,12 +0,0 @@
|
||||
{ callPackage, fetchFromGitHub, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msgpack";
|
||||
repo = "msgpack-c";
|
||||
rev = "cpp-${version}";
|
||||
sha256 = "189m44pwpcpf7g4yhzfla4djqyp2kl54wxmwfaj94gwgj5s370i7";
|
||||
};
|
||||
})
|
@ -9267,8 +9267,6 @@ with pkgs;
|
||||
libmtp = callPackage ../development/libraries/libmtp { };
|
||||
|
||||
libmsgpack = callPackage ../development/libraries/libmsgpack { };
|
||||
libmsgpack_2_0 = callPackage ../development/libraries/libmsgpack/2.0.nix { };
|
||||
libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { };
|
||||
|
||||
libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {
|
||||
mysql = mysql57;
|
||||
|
Loading…
Reference in New Issue
Block a user