diff options
| author | Artturin <Artturin@artturin.com> | 2022-10-06 19:38:53 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-10-10 15:40:21 +0300 |
| commit | 7e49471316373c471a3bf4b78c130ebc907ae2d2 (patch) | |
| tree | 73e4fd3e290d0a79934d2b9273c1b5b51c8af8f1 /pkgs/servers/foundationdb | |
| parent | f4ea1208ec732d423a784bbb2b882f997b6af902 (diff) | |
| download | nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar.gz nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar.bz2 nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar.lz nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar.xz nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar.zst nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.zip | |
treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
Diffstat (limited to 'pkgs/servers/foundationdb')
| -rw-r--r-- | pkgs/servers/foundationdb/cmake.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/foundationdb/vsmake.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 98fd6ca7981..9d65198c8ce 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -33,7 +33,7 @@ let buildInputs = [ libressl boost ]; nativeBuildInputs = [ cmake ninja python3 openjdk mono ] - ++ lib.optional useClang [ llvmPackages.lld ]; + ++ lib.optionals useClang [ llvmPackages.lld ]; separateDebugInfo = true; dontFixCmake = true; diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index 284dc9fb3bd..21ee2e4f848 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -84,11 +84,11 @@ 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.versionOlder version "6.0") [ "fdb_c" ] + ++ lib.optionals (lib.versionOlder version "6.0") [ "fdb_c" ] # Needed environment overrides ++ [ "KVRELEASE=1" "NOSTRIP=1" - ] ++ lib.optional officialRelease [ "RELEASE=true" ]; + ] ++ lib.optionals officialRelease [ "RELEASE=true" ]; # on 6.0 and later, we can specify all this information manually configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' |