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

ceph: More refactoring

Browse Source
This commit is contained in:
William A. Kennington III 2015-04-22 14:32:41 -07:00
parent 05d7fb2054
commit fe69e24330
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which { stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which
, boost, python, pythonPackages, libxml2 , boost, python, pythonPackages, libxml2, git
# Optional Dependencies # Optional Dependencies
, snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null , snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
@ -80,7 +80,8 @@ stdenv.mkDerivation {
buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask
] ++ optional (versionAtLeast version "0.95") [ ] ++ optional (versionAtLeast version "0.95") [
pythonPackages.sphinx git # Used for the gitversion string
pythonPackages.sphinx # Used for docs
] ++ optional stdenv.isLinux [ ] ++ optional stdenv.isLinux [
linuxHeaders libuuid udev keyutils libaio libxfs zfs linuxHeaders libuuid udev keyutils libaio libxfs zfs
] ++ optional hasServer [ ] ++ optional hasServer [

2
pkgs/tools/filesystems/ceph/git.nix
View File

@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20"; rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20";
sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb"; sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb";
}; };
buildInputs = [ git ];
}) })