diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-10-05 13:23:17 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-10-05 13:23:17 +0100 |
| commit | 96da271ae074712a163f65f6cb9b6bae8c5da017 (patch) | |
| tree | cdfd8fb3cf553b102d6153300d92933502a2e436 /pkgs | |
| parent | d6b777875361aa2f18a3f75f56fe109e38832211 (diff) | |
| download | nixpkgs-96da271ae074712a163f65f6cb9b6bae8c5da017.tar nixpkgs-96da271ae074712a163f65f6cb9b6bae8c5da017.tar.gz nixpkgs-96da271ae074712a163f65f6cb9b6bae8c5da017.tar.bz2 nixpkgs-96da271ae074712a163f65f6cb9b6bae8c5da017.tar.lz nixpkgs-96da271ae074712a163f65f6cb9b6bae8c5da017.tar.xz nixpkgs-96da271ae074712a163f65f6cb9b6bae8c5da017.tar.zst nixpkgs-96da271ae074712a163f65f6cb9b6bae8c5da017.zip | |
libmsgpack: update to 0.5.9
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libmsgpack/CMakeLists.patch | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/libmsgpack/default.nix | 19 |
2 files changed, 17 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libmsgpack/CMakeLists.patch b/pkgs/development/libraries/libmsgpack/CMakeLists.patch new file mode 100644 index 00000000000..657c30d5fe9 --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/CMakeLists.patch @@ -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) diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index ab9dbd48ea4..d9f4bfcc750 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -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++"; |