diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
| commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
| tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/servers/foundationdb | |
| parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
| parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
| download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip | |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/servers/foundationdb')
| -rw-r--r-- | nixpkgs/pkgs/servers/foundationdb/cmake.nix | 13 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/foundationdb/default.nix | 6 |
2 files changed, 9 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/servers/foundationdb/cmake.nix b/nixpkgs/pkgs/servers/foundationdb/cmake.nix index ae693a49027f..4ae96e95269c 100644 --- a/nixpkgs/pkgs/servers/foundationdb/cmake.nix +++ b/nixpkgs/pkgs/servers/foundationdb/cmake.nix @@ -41,9 +41,10 @@ let cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBRESSL_USE_STATIC_LIBS=FALSE" + (lib.optionalString officialRelease "-DFDB_RELEASE=TRUE") - # 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/nixpkgs/pkgs/servers/foundationdb/default.nix b/nixpkgs/pkgs/servers/foundationdb/default.nix index 790959f0a0d6..ec28986f2e20 100644 --- a/nixpkgs/pkgs/servers/foundationdb/default.nix +++ b/nixpkgs/pkgs/servers/foundationdb/default.nix @@ -69,11 +69,9 @@ in with builtins; { # ------------------------------------------------------ foundationdb61 = cmakeBuild rec { - version = "6.1.6pre4898_${substring 0 7 rev}"; + version = "6.1.8"; branch = "release-6.1"; - rev = "26fbbbf798971b2b9ecb882a8af766fa36734f53"; - sha256 = "1q1a1j8h0qlh67khcds0dg416myvjbp6gfm6s4sk8d60zfzny7wb"; - officialRelease = false; + sha256 = "1qd9yf3a7a99nfx7vky0jy8r74yrxjwp9imc6792awn66256pxiv"; patches = [ ./patches/clang-libcxx.patch |