From 34fbb4150044d50bdeea8c4ba97df7a7820b6c03 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 5 Aug 2015 19:28:01 -0700 Subject: ceph: Support newer git version --- pkgs/tools/filesystems/ceph/generic.nix | 85 +++++++++++++++++---------------- 1 file changed, 45 insertions(+), 40 deletions(-) (limited to 'pkgs/tools/filesystems/ceph') diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index dca6d93002064..8b9cefdbf239e 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -164,50 +164,55 @@ stdenv.mkDerivation { ''; configureFlags = [ - (mkOther "exec_prefix" "\${out}") - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkOther "libdir" "\${lib}/lib") - (mkOther "includedir" "\${lib}/include") - (mkWith true "rbd" null) - (mkWith true "cephfs" null) - (mkWith hasRadosgw "radosgw" null) - (mkWith true "radosstriper" null) - (mkWith hasServer "mon" null) - (mkWith hasServer "osd" null) - (mkWith hasServer "mds" null) - (mkEnable true "client" null) - (mkEnable hasServer "server" null) - (mkWith (cryptoStr == "cryptopp") "cryptopp" null) - (mkWith (cryptoStr == "nss") "nss" null) - (mkEnable false "root-make-check" null) - (mkWith false "profiler" null) - (mkWith false "debug" null) - (mkEnable false "coverage" null) - (mkWith (optFuse != null) "fuse" null) - (mkWith (malloc == optJemalloc) "jemalloc" null) - (mkWith (malloc == optGperftools) "tcmalloc" null) - (mkEnable false "pgrefdebugging" null) - (mkEnable false "cephfs-java" null) - (mkEnable hasXio "xio" null) - (mkWith (optLibatomic_ops != null) "libatomic-ops" null) - (mkWith true "ocf" null) - (mkWith hasKinetic "kinetic" null) - (mkWith hasRocksdb "librocksdb" null) - (mkWith false "librocksdb-static" null) + (mkOther "exec_prefix" "\${out}") + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkOther "libdir" "\${lib}/lib") + (mkOther "includedir" "\${lib}/include") + (mkWith true "rbd" null) + (mkWith true "cephfs" null) + (mkWith hasRadosgw "radosgw" null) + (mkWith true "radosstriper" null) + (mkWith hasServer "mon" null) + (mkWith hasServer "osd" null) + (mkWith hasServer "mds" null) + (mkEnable true "client" null) + (mkEnable hasServer "server" null) + (mkWith (cryptoStr == "cryptopp") "cryptopp" null) + (mkWith (cryptoStr == "nss") "nss" null) + (mkEnable false "root-make-check" null) + (mkWith false "profiler" null) + (mkWith false "debug" null) + (mkEnable false "coverage" null) + (mkWith (optFuse != null) "fuse" null) + (mkWith (malloc == optJemalloc) "jemalloc" null) + (mkWith (malloc == optGperftools) "tcmalloc" null) + (mkEnable false "pgrefdebugging" null) + (mkEnable false "cephfs-java" null) + (mkEnable hasXio "xio" null) + (mkWith (optLibatomic_ops != null) "libatomic-ops" null) + (mkWith true "ocf" null) + (mkWith hasKinetic "kinetic" null) + (mkWith hasRocksdb "librocksdb" null) + (mkWith false "librocksdb-static" null) ] ++ optional stdenv.isLinux [ - (mkWith (optLibaio != null) "libaio" null) - (mkWith (optLibxfs != null) "libxfs" null) - (mkWith (optZfs != null) "libzfs" null) + (mkWith (optLibaio != null) "libaio" null) + (mkWith (optLibxfs != null) "libxfs" null) + (mkWith (optZfs != null) "libzfs" null) + ] ++ optional (versionAtLeast version "0.94.3") [ + (mkWith false "tcmalloc-minimal" null) ] ++ optional (versionAtLeast version "9.0.1") [ - (mkWith false "tcmalloc-minimal" null) - (mkWith false "valgrind" null) + (mkWith false "valgrind" null) ] ++ optional (versionAtLeast version "9.0.2") [ - (mkWith true "man-pages" null) - (mkWith true "systemd-libexec-dir" "\${TMPDIR}") + (mkWith true "man-pages" null) + (mkWith true "systemd-libexec-dir" "\${out}/libexec") ] ++ optional (versionOlder version "10.0.0") [ - (mkWith (optLibs3 != null) "system-libs3" null) - (mkWith true "rest-bench" null) + (mkWith (optLibs3 != null) "system-libs3" null) + (mkWith true "rest-bench" null) + ] ++ optional (versionAtLeast version "10.0.0") [ + (mkWith true "rgw-user" "rgw") + (mkWith true "rgw-group" "rgw") + (mkWith true "systemd-unit-dir" "\${out}/etc/systemd/system") ]; preBuild = optionalString (versionAtLeast version "9.0.0") '' -- cgit 1.4.1