diff options
author | Daniel Kuehn <daniel@kuehn.se> | 2018-03-21 21:53:02 +0100 |
---|---|---|
committer | Daniel Kuehn <daniel@kuehn.se> | 2018-03-21 21:53:02 +0100 |
commit | a9a7580c3fe85c8497c3aa3dbe8b7a27ebdda7a5 (patch) | |
tree | 89d7ce00c3b0ddc96f382b1dbf12f4c8b6e93f17 /pkgs/tools/filesystems/ceph | |
parent | ed3ad74a4862f4c97be6f1ff01185416eecaea41 (diff) |
ceph: Add makeWrapper to dependencies and nativeBuildInputs
The ceph-mgr daemon needs to know the location of cephs own-made python modules for some of the modules that you can enable for it. With wrapProgram, a wrapper is added that sets the proper pythonpath environment variable for the ceph-mgr daemon so its modules can find the ceph python modules
Diffstat (limited to 'pkgs/tools/filesystems/ceph')
-rw-r--r-- | pkgs/tools/filesystems/ceph/generic.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 32b85eaa68157..a637d3891ec0a 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -5,7 +5,7 @@ , openldap, lttngUst , babeltrace, gperf , cunit, snappy -, rocksdb +, rocksdb, makeWrapper # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -97,6 +97,7 @@ let ps.pecan ps.prettytable ps.webob + ps.cherrypy ]); in @@ -114,7 +115,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig which git python2Packages.wrapPython + pkgconfig which git python2Packages.wrapPython makeWrapper (ensureNewerSourcesHook { year = "1980"; }) ]; @@ -159,6 +160,7 @@ stdenv.mkDerivation { postFixup = '' wrapPythonPrograms + wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/lib/python2.7/site-packages ''; enableParallelBuilding = true; |