From 65663f883c4debc2067a11f202725759cedb4fd5 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 17 Aug 2018 23:53:33 +0000
Subject: msgpack: rename from libmsgpack

The project does not use the name "libmsgpack". It variously uses "msgpack" and
"msgpack-c", and "msgpackc" for the name of the library.
---
 pkgs/development/libraries/libmsgpack/default.nix | 12 ---------
 pkgs/development/libraries/libmsgpack/generic.nix | 30 -----------------------
 pkgs/development/libraries/libtoxcore/default.nix |  4 +--
 pkgs/development/libraries/msgpack/default.nix    | 12 +++++++++
 pkgs/development/libraries/msgpack/generic.nix    | 30 +++++++++++++++++++++++
 pkgs/development/libraries/opendht/default.nix    |  4 +--
 6 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmsgpack/default.nix
 delete mode 100644 pkgs/development/libraries/libmsgpack/generic.nix
 create mode 100644 pkgs/development/libraries/msgpack/default.nix
 create mode 100644 pkgs/development/libraries/msgpack/generic.nix

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix
deleted file mode 100644
index bf51f8954025..000000000000
--- a/pkgs/development/libraries/libmsgpack/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ callPackage, fetchFromGitHub, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "3.0.1";
-
-  src = fetchFromGitHub {
-    owner  = "msgpack";
-    repo   = "msgpack-c";
-    rev    = "cpp-${version}";
-    sha256 = "0nr6y9v4xbvzv717j9w9lhmags1y2s5mq103v044qlyd2jkbg2p4";
-  };
-})
diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix
deleted file mode 100644
index 947960d23592..000000000000
--- a/pkgs/development/libraries/libmsgpack/generic.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, cmake
-, version, src, patches ? [ ]
-, hostPlatform
-, ...
-}:
-
-stdenv.mkDerivation rec {
-  name = "libmsgpack-${version}";
-
-  inherit src patches;
-
-  nativeBuildInputs = [ cmake ];
-
-  enableParallelBuilding = true;
-
-  cmakeFlags = []
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
-                           "-DMSGPACK_BUILD_EXAMPLES=OFF"
-    ++ stdenv.lib.optional (hostPlatform.libc == "msvcrt")
-                           "-DCMAKE_SYSTEM_NAME=Windows"
-    ;
-
-  meta = with stdenv.lib; {
-    description = "MessagePack implementation for C and C++";
-    homepage    = https://msgpack.org;
-    license     = licenses.asl20;
-    maintainers = with maintainers; [ redbaron wkennington ];
-    platforms   = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index a005c8b37465..e588944490b3 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack
+{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack
 , libvpx, check, libconfig, pkgconfig }:
 
 let
@@ -20,7 +20,7 @@ let
     ];
 
     buildInputs = [
-      libsodium libmsgpack ncurses libconfig
+      libsodium msgpack ncurses libconfig
     ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
       libopus libvpx
     ];
diff --git a/pkgs/development/libraries/msgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix
new file mode 100644
index 000000000000..bf51f8954025
--- /dev/null
+++ b/pkgs/development/libraries/msgpack/default.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchFromGitHub, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "3.0.1";
+
+  src = fetchFromGitHub {
+    owner  = "msgpack";
+    repo   = "msgpack-c";
+    rev    = "cpp-${version}";
+    sha256 = "0nr6y9v4xbvzv717j9w9lhmags1y2s5mq103v044qlyd2jkbg2p4";
+  };
+})
diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix
new file mode 100644
index 000000000000..67418b6666d4
--- /dev/null
+++ b/pkgs/development/libraries/msgpack/generic.nix
@@ -0,0 +1,30 @@
+{ stdenv, cmake
+, version, src, patches ? [ ]
+, hostPlatform
+, ...
+}:
+
+stdenv.mkDerivation rec {
+  name = "msgpack-${version}";
+
+  inherit src patches;
+
+  nativeBuildInputs = [ cmake ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = []
+    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+                           "-DMSGPACK_BUILD_EXAMPLES=OFF"
+    ++ stdenv.lib.optional (hostPlatform.libc == "msvcrt")
+                           "-DCMAKE_SYSTEM_NAME=Windows"
+    ;
+
+  meta = with stdenv.lib; {
+    description = "MessagePack implementation for C and C++";
+    homepage    = https://msgpack.org;
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ redbaron wkennington ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index 2bb82efb24ce..bd7d252e1a08 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -6,7 +6,7 @@
 , pkgconfig
 , nettle
 , gnutls
-, libmsgpack
+, msgpack
 , readline
 , libargon2
 }:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     pkgconfig
     nettle
     gnutls
-    libmsgpack
+    msgpack
     readline
     libargon2
   ];
-- 
cgit 1.4.1