diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
commit | f54b387b63299245092d9bbf09cb562bac125461 (patch) | |
tree | 0c09809c0964d7bd931c6c8d1a7d19dcac342abd /pkgs/servers/foundationdb/default.nix | |
parent | 66d7126255b96a3d9c1cc0cdd7c2cd79d1789758 (diff) | |
parent | 0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc (diff) | |
download | nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.gz nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.bz2 nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.lz nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.xz nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.zst nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.zip |
Merge remote-tracking branch 'central/master' into viric_clean
Diffstat (limited to 'pkgs/servers/foundationdb/default.nix')
-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 461b90bc978..7c7da361246 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"; }; } |