diff options
| author | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-27 14:13:12 +0800 |
|---|---|---|
| committer | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-27 14:13:12 +0800 |
| commit | a33d4ed98489a7ec0f7c39000c57f724147a6545 (patch) | |
| tree | 0bf31428efaf5052f18f591e3d0792343983ac2d /pkgs/servers | |
| parent | b2104d93ff319e26a036b1d5afe8d57322c536be (diff) | |
| parent | f8e8ecde51b49132d7f8d5adb971c0e37eddcdc2 (diff) | |
| download | nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar.gz nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar.bz2 nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar.lz nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar.xz nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.tar.zst nixlib-a33d4ed98489a7ec0f7c39000c57f724147a6545.zip | |
Merge branch 'master' into cross-compiling-postgresql
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/foundationdb/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 461b90bc978c..7c7da3612465 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -85,6 +85,7 @@ let --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto' ''; + separateDebugInfo = true; enableParallelBuilding = true; makeFlags = [ "all" "fdb_java" ] @@ -92,7 +93,9 @@ let # it gets statically linked in ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] # Needed environment overrides - ++ [ "KVRELEASE=1" ]; + ++ [ "KVRELEASE=1" + "NOSTRIP=1" + ]; # on 6.0 and later, we can specify all this information manually configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' @@ -152,9 +155,9 @@ in with builtins; { }; foundationdb60 = makeFdb rec { - version = "6.0.2pre2430_${substring 0 8 rev}"; + version = "6.0.3pre2446_${substring 0 8 rev}"; branch = "release-6.0"; - rev = "7938d247a5eaf886a176575de6592b76374df58c"; - sha256 = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h"; + rev = "dd5481fb60ee1652986b2a028b31dcbb6cb171b5"; + sha256 = "0mhlb728badk1h3410jbhy7f48m3jjnjna26wwyw5680xz72d6dm"; }; } |