diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 18:34:45 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 23:00:13 +0300 |
| commit | 810135363eccff4f460a59621e00ef566ab2a48e (patch) | |
| tree | d8d07af4362c31338a934043cc5f70bb79e6d06f /pkgs/tools | |
| parent | 0478682f09fd0363a0909c49c0324a659bd38222 (diff) | |
| download | nixlib-810135363eccff4f460a59621e00ef566ab2a48e.tar nixlib-810135363eccff4f460a59621e00ef566ab2a48e.tar.gz nixlib-810135363eccff4f460a59621e00ef566ab2a48e.tar.bz2 nixlib-810135363eccff4f460a59621e00ef566ab2a48e.tar.lz nixlib-810135363eccff4f460a59621e00ef566ab2a48e.tar.xz nixlib-810135363eccff4f460a59621e00ef566ab2a48e.tar.zst nixlib-810135363eccff4f460a59621e00ef566ab2a48e.zip | |
ceph: Fix 'lib.optional' use
Produces a list of list as buildInputs.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/filesystems/ceph/generic.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index ad237e408c66..07bfec41f477 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -121,19 +121,19 @@ stdenv.mkDerivation { ]; buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib - ] ++ optional (versionAtLeast version "9.0.0") [ + ] ++ optionals (versionAtLeast version "9.0.0") [ pythonPackages.sphinx # Used for docs - ] ++ optional stdenv.isLinux [ + ] ++ optionals stdenv.isLinux [ linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs - ] ++ optional hasServer [ + ] ++ optionals hasServer [ optSnappy optLeveldb - ] ++ optional hasRadosgw [ + ] ++ optionals hasRadosgw [ optFcgi optExpat optCurl optFuse optLibedit - ] ++ optional hasXio [ + ] ++ optionals hasXio [ optAccelio optLibibverbs optLibrdmacm - ] ++ optional hasRocksdb [ + ] ++ optionals hasRocksdb [ optRocksdb - ] ++ optional hasKinetic [ + ] ++ optionals hasKinetic [ optKinetic-cpp-client ]; |