foundationdb61: 6.1.6pre4898 -> 6.1.7pre4928

Also includes some minor, miscellaneous cleanups to the CMake build
expression.

Signed-off-by: Austin Seipp <aseipp@pobox.com>

2 files changed, 10 insertions, 9 deletions

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index ae693a49027f2..a578b7e0e5380 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -41,9 +41,10 @@ let
 
         cmakeFlags =
           [ "-DCMAKE_BUILD_TYPE=Release"
-            "-DLIBRESSL_USE_STATIC_LIBS=FALSE"
+            (lib.optionalString officialRelease "FDB_RELEASE=1")
 
-            # CMake can't find these easily for some reason?
+            # FIXME: why can't libressl be found automatically?
+            "-DLIBRESSL_USE_STATIC_LIBS=FALSE"
             "-DLIBRESSL_INCLUDE_DIR=${libressl.dev}"
             "-DLIBRESSL_CRYPTO_LIBRARY=${libressl.out}/lib/libcrypto.so"
             "-DLIBRESSL_SSL_LIBRARY=${libressl.out}/lib/libssl.so"
@@ -51,8 +52,6 @@ let
 
             # LTO brings up overall build time, but results in much smaller
             # binaries for all users and the cache.
-            #
-            # TODO FIXME: bugs :(
             (lib.optionalString (!useClang) "-DUSE_LTO=ON")
 
             # Gold helps alleviate the link time, especially when LTO is
@@ -60,10 +59,12 @@ let
             # Same with LLD when Clang is available.
             (lib.optionalString useClang    "-DUSE_LD=LLD")
             (lib.optionalString (!useClang) "-DUSE_LD=GOLD")
-          ]
-          ++ lib.optional officialRelease [ "FDB_RELEASE=1" ];
+          ];
 
         inherit patches;
+
+        # fix up the use of the very weird and custom 'fdb_install' command by just
+        # replacing it with cmake's ordinary version.
         postPatch = ''
           for x in bindings/c/CMakeLists.txt fdbserver/CMakeLists.txt fdbmonitor/CMakeLists.txt fdbbackup/CMakeLists.txt fdbcli/CMakeLists.txt; do 
             substituteInPlace $x --replace 'fdb_install' 'install'
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 790959f0a0d6f..713cc135d2944 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -69,10 +69,10 @@ in with builtins; {
   # ------------------------------------------------------
 
   foundationdb61 = cmakeBuild rec {
-    version = "6.1.6pre4898_${substring 0 7 rev}";
+    version = "6.1.7pre4928_${substring 0 7 rev}";
     branch  = "release-6.1";
-    rev     = "26fbbbf798971b2b9ecb882a8af766fa36734f53";
-    sha256  = "1q1a1j8h0qlh67khcds0dg416myvjbp6gfm6s4sk8d60zfzny7wb";
+    rev     = "a990458e81612632159bbf75167a36f64ef228d1";
+    sha256  = "1b8ij78xjy30q93hvnrw8llw16q5zlmlq3l6dvnnf8w6ws88y1k0";
     officialRelease = false;
 
     patches = [