diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-19 22:56:44 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-19 22:56:47 -0700 |
| commit | 35da88466730822573b19205d1d292f51924bdf8 (patch) | |
| tree | 967c82810168d16d8fbc9bdb0d9a98bd8e156f4b /pkgs/tools/filesystems/ceph/generic.nix | |
| parent | cf94a678f33ce3f051e75f22369dcf02489df005 (diff) | |
| download | nixlib-35da88466730822573b19205d1d292f51924bdf8.tar nixlib-35da88466730822573b19205d1d292f51924bdf8.tar.gz nixlib-35da88466730822573b19205d1d292f51924bdf8.tar.bz2 nixlib-35da88466730822573b19205d1d292f51924bdf8.tar.lz nixlib-35da88466730822573b19205d1d292f51924bdf8.tar.xz nixlib-35da88466730822573b19205d1d292f51924bdf8.tar.zst nixlib-35da88466730822573b19205d1d292f51924bdf8.zip | |
ceph: Support newer versions
Diffstat (limited to 'pkgs/tools/filesystems/ceph/generic.nix')
| -rw-r--r-- | pkgs/tools/filesystems/ceph/generic.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 36baee6b99d5..33d9b3dc64f3 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -62,10 +62,10 @@ let none = [ ]; }; - wrapArgs = "--prefix PYTHONPATH : \"$(toPythonPath $lib)\"" + wrapArgs = "--set PYTHONPATH : \"$(toPythonPath $lib)\"" + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\"" + " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\"" - + " --prefix PATH : \"$out/bin\""; + + " --set PATH : \"$out/bin\""; in stdenv.mkDerivation { name="ceph-${version}"; @@ -79,7 +79,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask zlib - ] ++ optional (versionAtLeast version "0.95") [ + ] ++ optional (versionAtLeast version "9.0.0") [ git # Used for the gitversion string pythonPackages.sphinx # Used for docs ] ++ optional stdenv.isLinux [ @@ -158,6 +158,10 @@ stdenv.mkDerivation { (mkWith (libaio != null) "libaio" null) (mkWith (libxfs != null) "libxfs" null) (mkWith (zfs != null) "libzfs" null) + ] ++ optional (versionAtLeast version "10.0.0") [ + (mkWith true "man-pages" null) + (mkWith false "tcmalloc-minimal" null) + (mkWith false "valgrind" null) ]; installFlags = [ "sysconfdir=\${out}/etc" ]; |