diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-26 06:01:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 06:01:08 +0000 |
| commit | f8c265f433f3f5cf4bb4e25b03b75751c3aaf47a (patch) | |
| tree | 6336845aef4d3882b39256a810c7fe8419fc98cf /pkgs/servers/foundationdb | |
| parent | 4a997ba4a66738d5c679c61a32cd57a7ca80d682 (diff) | |
| parent | 4586388f855782243da0e5f64b1b0144f692ef5b (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/foundationdb')
| -rw-r--r-- | pkgs/servers/foundationdb/vsmake.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index 178cd135fe2ca..284dc9fb3bd51 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -84,7 +84,7 @@ let makeFlags = [ "all" "fdb_java" "fdb_python" ] # Don't compile FDBLibTLS if we don't need it in 6.0 or later; # it gets statically linked in - ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] + ++ lib.optional (lib.versionOlder version "6.0") [ "fdb_c" ] # Needed environment overrides ++ [ "KVRELEASE=1" "NOSTRIP=1" @@ -100,7 +100,7 @@ let installPhase = '' mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb - '' + lib.optionalString (!lib.versionAtLeast version "6.0") '' + '' + lib.optionalString (lib.versionOlder version "6.0") '' # we only copy the TLS library on < 6.0, since it's compiled-in otherwise cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so '' + '' |