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

ceph: Support newer git version

Browse Source
This commit is contained in:
William A. Kennington III 2015-08-05 19:28:01 -07:00
parent 5c6aa391fc
commit 34fbb41500
1 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,50 +164,55 @@ stdenv.mkDerivation {
''; '';
configureFlags = [ configureFlags = [
(mkOther "exec_prefix" "\${out}") (mkOther "exec_prefix" "\${out}")
(mkOther "sysconfdir" "/etc") (mkOther "sysconfdir" "/etc")
(mkOther "localstatedir" "/var") (mkOther "localstatedir" "/var")
(mkOther "libdir" "\${lib}/lib") (mkOther "libdir" "\${lib}/lib")
(mkOther "includedir" "\${lib}/include") (mkOther "includedir" "\${lib}/include")
(mkWith true "rbd" null) (mkWith true "rbd" null)
(mkWith true "cephfs" null) (mkWith true "cephfs" null)
(mkWith hasRadosgw "radosgw" null) (mkWith hasRadosgw "radosgw" null)
(mkWith true "radosstriper" null) (mkWith true "radosstriper" null)
(mkWith hasServer "mon" null) (mkWith hasServer "mon" null)
(mkWith hasServer "osd" null) (mkWith hasServer "osd" null)
(mkWith hasServer "mds" null) (mkWith hasServer "mds" null)
(mkEnable true "client" null) (mkEnable true "client" null)
(mkEnable hasServer "server" null) (mkEnable hasServer "server" null)
(mkWith (cryptoStr == "cryptopp") "cryptopp" null) (mkWith (cryptoStr == "cryptopp") "cryptopp" null)
(mkWith (cryptoStr == "nss") "nss" null) (mkWith (cryptoStr == "nss") "nss" null)
(mkEnable false "root-make-check" null) (mkEnable false "root-make-check" null)
(mkWith false "profiler" null) (mkWith false "profiler" null)
(mkWith false "debug" null) (mkWith false "debug" null)
(mkEnable false "coverage" null) (mkEnable false "coverage" null)
(mkWith (optFuse != null) "fuse" null) (mkWith (optFuse != null) "fuse" null)
(mkWith (malloc == optJemalloc) "jemalloc" null) (mkWith (malloc == optJemalloc) "jemalloc" null)
(mkWith (malloc == optGperftools) "tcmalloc" null) (mkWith (malloc == optGperftools) "tcmalloc" null)
(mkEnable false "pgrefdebugging" null) (mkEnable false "pgrefdebugging" null)
(mkEnable false "cephfs-java" null) (mkEnable false "cephfs-java" null)
(mkEnable hasXio "xio" null) (mkEnable hasXio "xio" null)
(mkWith (optLibatomic_ops != null) "libatomic-ops" null) (mkWith (optLibatomic_ops != null) "libatomic-ops" null)
(mkWith true "ocf" null) (mkWith true "ocf" null)
(mkWith hasKinetic "kinetic" null) (mkWith hasKinetic "kinetic" null)
(mkWith hasRocksdb "librocksdb" null) (mkWith hasRocksdb "librocksdb" null)
(mkWith false "librocksdb-static" null) (mkWith false "librocksdb-static" null)
] ++ optional stdenv.isLinux [ ] ++ optional stdenv.isLinux [
(mkWith (optLibaio != null) "libaio" null) (mkWith (optLibaio != null) "libaio" null)
(mkWith (optLibxfs != null) "libxfs" null) (mkWith (optLibxfs != null) "libxfs" null)
(mkWith (optZfs != null) "libzfs" null) (mkWith (optZfs != null) "libzfs" null)
] ++ optional (versionAtLeast version "0.94.3") [
(mkWith false "tcmalloc-minimal" null)
] ++ optional (versionAtLeast version "9.0.1") [ ] ++ 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") [ ] ++ optional (versionAtLeast version "9.0.2") [
(mkWith true "man-pages" null) (mkWith true "man-pages" null)
(mkWith true "systemd-libexec-dir" "\${TMPDIR}") (mkWith true "systemd-libexec-dir" "\${out}/libexec")
] ++ optional (versionOlder version "10.0.0") [ ] ++ optional (versionOlder version "10.0.0") [
(mkWith (optLibs3 != null) "system-libs3" null) (mkWith (optLibs3 != null) "system-libs3" null)
(mkWith true "rest-bench" 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") '' preBuild = optionalString (versionAtLeast version "9.0.0") ''