1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00

Merge pull request #4385 from vbgl/libmsgpack

libmsgpack: update to 0.5.9
This commit is contained in:
Aristid Breitkreuz 2014-10-05 14:31:02 +02:00
commit 1be75876d1
2 changed files with 17 additions and 14 deletions

View file

@ -0,0 +1,12 @@
diff -r 791a4edd7e1d CMakeLists.txt
--- a/CMakeLists.txt Sun Oct 05 13:14:14 2014 +0100
+++ b/CMakeLists.txt Sun Oct 05 13:20:12 2014 +0100
@@ -158,7 +158,7 @@
INSTALL (TARGETS msgpack msgpack-static DESTINATION lib)
INSTALL (DIRECTORY src/msgpack DESTINATION include)
INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include)
-INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig)
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION lib/pkgconfig)
# Doxygen
FIND_PACKAGE (Doxygen)

View file

@ -1,25 +1,16 @@
{ stdenv, fetchurl, autoconf, automake, libtool, ruby, scatterOutputHook }:
{ stdenv, fetchurl, cmake}:
stdenv.mkDerivation rec {
version = "0.5.8";
version = "0.5.9";
name = "libmsgpack-${version}";
src = fetchurl {
url = "https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz";
sha256 = "1h6k9kdbfavmw3by5kk3raszwa64hn9k8yw9rdhvl5m8g2lks89k";
sha256 = "0xy204srq5grng7p17hwdxpfzbsfrn89gi4c3k62a23p4f9z0szq";
};
nativeBuildInputs = [ scatterOutputHook ];
buildInputs = [ autoconf automake libtool ruby ];
outputs = [ "out" "bin" ];
preConfigure = ''
sed -i s,glibtoolize,libtoolize, ./bootstrap
./bootstrap
'';
enableParallelBuilding = true;
buildInputs = [ cmake ];
patches = [ ./CMakeLists.patch ];
meta = with stdenv.lib; {
description = "MessagePack implementation for C and C++";