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

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

@ -199,15 +199,20 @@ stdenv.mkDerivation {
(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 "9.0.1") [ ] ++ optional (versionAtLeast version "0.94.3") [
(mkWith false "tcmalloc-minimal" null) (mkWith false "tcmalloc-minimal" null)
] ++ optional (versionAtLeast version "9.0.1") [
(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") ''