nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-18 01:54:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph: Support newer versions

Browse Source
This commit is contained in:
William A. Kennington III 2015-05-19 22:56:44 -07:00
parent cf94a678f3
commit 35da884667
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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" ];