From 3b2c5a8972c630695c39c9a44d8c0ea8b639cf7f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Tue, 9 Feb 2021 21:46:37 +0000 Subject: [PATCH] 3p/nixpkgs: disable bundled rocksdb --- third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 61cc457369..ce6c125814 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -9,7 +9,7 @@ , babeltrace, gperf , gtest , cunit, snappy -, rocksdb, makeWrapper +, makeWrapper , leveldb, oathToolkit , libnl, libcap_ng , rdkafka @@ -146,7 +146,7 @@ in rec { buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit - snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka + snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka ] ++ lib.optionals stdenv.isLinux [ linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 @@ -176,7 +176,6 @@ in rec { "-DWITH_SYSTEM_BOOST=ON" - "-DWITH_SYSTEM_ROCKSDB=ON" "-DWITH_SYSTEM_GTEST=ON" "-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}" "-DWITH_SYSTEMD=OFF"