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

ceph: Add zfs support

Browse Source
This commit is contained in:
William A. Kennington III 2014-09-25 01:24:42 -07:00
parent 1cd727180e
commit 32aa544fb6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,8 +2,10 @@
, boost, btrfsProgs, cryptopp, curl, expat, fcgi, fuse, gperftools, keyutils , boost, btrfsProgs, cryptopp, curl, expat, fcgi, fuse, gperftools, keyutils
, leveldb, libaio, libatomic_ops, libedit, libuuid, linuxHeaders, openssl , leveldb, libaio, libatomic_ops, libedit, libuuid, linuxHeaders, openssl
, python, snappy, udev, xfsprogs, xz , python, snappy, udev, xfsprogs, xz
, zfs ? null
}: }:
with stdenv.lib;
let let
wrapArgs = "--prefix PYTHONPATH : \"$(toPythonPath $out)\"" wrapArgs = "--prefix PYTHONPATH : \"$(toPythonPath $out)\""
+ " --prefix PATH : \"$out/bin\"" + " --prefix PATH : \"$out/bin\""
@ -28,14 +30,16 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost boost.lib btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils boost boost.lib btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils
libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python
snappy udev xfsprogs.lib xz snappy udev xfsprogs.lib xz zfs
]; ];
preConfigure = '' preConfigure = ''
./autogen.sh ./autogen.sh
''; '';
configureFlags = [ "--exec_prefix=$(out)" ]; configureFlags = [
"--exec_prefix=$(out)"
] ++ optional (zfs != null) "--with-zfs=${zfs}";
postInstall = '' postInstall = ''
wrapProgram $out/bin/ceph ${wrapArgs} wrapProgram $out/bin/ceph ${wrapArgs}
@ -45,7 +49,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = {
homepage = http://ceph.com/; homepage = http://ceph.com/;
description = "Distributed storage system"; description = "Distributed storage system";
license = licenses.lgpl21; license = licenses.lgpl21;

4
pkgs/top-level/all-packages.nix
View File

@ -768,7 +768,9 @@ let
cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
ceph = callPackage ../tools/filesystems/ceph { }; ceph = callPackage ../tools/filesystems/ceph {
zfs = linuxPackages.zfs;
};
cfdg = builderDefsPackage ../tools/graphics/cfdg { cfdg = builderDefsPackage ../tools/graphics/cfdg {
inherit libpng bison flex ffmpeg; inherit libpng bison flex ffmpeg;