Merge master into staging-next

2 files changed, 26 insertions, 8 deletions

diff --git a/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch b/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch
new file mode 100644
index 00000000000..51ffa92652e
--- /dev/null
+++ b/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch
@@ -0,0 +1,11 @@
+diff --color -ur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2020-12-10 10:39:37.775694976 +0100
++++ b/CMakeLists.txt	2020-12-10 10:40:41.984575938 +0100
+@@ -127,6 +127,7 @@
+ add_definitions(-D__STDC_LIMIT_MACROS)
+ add_definitions(-D__STDC_CONSTANT_MACROS)
+ add_definitions(-D__STDC_FORMAT_MACROS)
++add_definitions(-DSPDLOG_FMT_EXTERNAL)
+ if(MINGW)
+   add_definitions(-DWINVER=0x0602)
+   add_definitions(-D_WIN32_WINNT=0x0602)
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix
index e2cb603ca3d..13086c067b0 100644
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/pkgs/tools/filesystems/lizardfs/default.nix
@@ -16,6 +16,7 @@
 , judy
 , pam
 , spdlog
+, fmt
 , zlib # optional
 }:
 
@@ -30,13 +31,6 @@ stdenv.mkDerivation rec {
     sha256 = "0zk73wmx82ari3m2mv0zx04x1ggsdmwcwn7k6bkl5c0jnxffc4ax";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
-
-  buildInputs =
-    [ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
-      zlib boost judy pam spdlog python2
-    ];
-
   patches = [
     # Use system-provided spdlog instead of downloading an old one (next two patches)
     (fetchpatch {
@@ -53,13 +47,26 @@ stdenv.mkDerivation rec {
       url = "https://github.com/lizardfs/lizardfs/commit/5d20c95179be09241b039050bceda3c46980c004.patch";
       sha256 = "185bfcz2rjr4cnxld2yc2nxwzz0rk4x1fl1sd25g8gr5advllmdv";
     })
+    # Add SPDLOG_FMT_EXTERNAL flag to disable spdlog from using bundled fmt
+    # Would use https://github.com/lizardfs/lizardfs/commit/31b0cd40f84ee75f99643ad19122061e3d6fb6cc.patch
+    # if it didn't failed to patch
+    ./cmake-def-spdlog-fmt-external.patch
+  ];
+
+  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+
+  buildInputs =
+  [ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
+    zlib boost judy pam spdlog fmt python2
   ];
+  
+  cmakeFlags = [ "-DSPDLOG_FMT_EXTERNAL=ON" ];
 
   meta = with stdenv.lib; {
     homepage = "https://lizardfs.com";
     description = "A highly reliable, scalable and efficient distributed file system";
     platforms = platforms.linux;
     license = licenses.gpl3;
-    maintainers = [ maintainers.rushmorem ];
+    maintainers = with maintainers; [ rushmorem shamilton ];
   };
 }