diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:00:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 11:22:20 +0200 |
| commit | bf414c9d4f892fd4e392a5f42016b57e84402a8b (patch) | |
| tree | 08c000d609ed8e608ca542fa78360e4217f3fc36 /pkgs/development/libraries/libmsgpack/0.5-CMake.patch | |
| parent | 29901451700a7382f3f9d5a0a23cd55b187e5585 (diff) | |
| parent | 9de9669496a05f64ea436c01f9b66c057cd74f90 (diff) | |
| download | nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.gz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.bz2 nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.lz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.xz nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.tar.zst nixpkgs-bf414c9d4f892fd4e392a5f42016b57e84402a8b.zip | |
Merge 'staging' into closure-size
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
Diffstat (limited to 'pkgs/development/libraries/libmsgpack/0.5-CMake.patch')
| -rw-r--r-- | pkgs/development/libraries/libmsgpack/0.5-CMake.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libmsgpack/0.5-CMake.patch b/pkgs/development/libraries/libmsgpack/0.5-CMake.patch new file mode 100644 index 00000000000..84377962d7f --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/0.5-CMake.patch @@ -0,0 +1,14 @@ +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 +@@ -157,8 +157,9 @@ + + INSTALL (TARGETS msgpack msgpack-static DESTINATION lib) + INSTALL (DIRECTORY src/msgpack DESTINATION include) ++INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/msgpack/version.h DESTINATION include/msgpack) + 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) |