public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ceph: Fix 'lib.optional' use

Browse Source 
Produces a list of list as buildInputs.
This commit is contained in:
Tuomas Tynkkynen 2016-08-30 18:34:45 +03:00
parent 0478682f09
commit 810135363e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/filesystems/ceph/generic.nix
View File

@ -121,19 +121,19 @@ stdenv.mkDerivation {
]; ];
buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib 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 pythonPackages.sphinx # Used for docs
] ++ optional stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
] ++ optional hasServer [ ] ++ optionals hasServer [
optSnappy optLeveldb optSnappy optLeveldb
] ++ optional hasRadosgw [ ] ++ optionals hasRadosgw [
optFcgi optExpat optCurl optFuse optLibedit optFcgi optExpat optCurl optFuse optLibedit
] ++ optional hasXio [ ] ++ optionals hasXio [
optAccelio optLibibverbs optLibrdmacm optAccelio optLibibverbs optLibrdmacm
] ++ optional hasRocksdb [ ] ++ optionals hasRocksdb [
optRocksdb optRocksdb
] ++ optional hasKinetic [ ] ++ optionals hasKinetic [
optKinetic-cpp-client optKinetic-cpp-client
]; ];