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
This commit is contained in:
Daniel Kuehn 2018-03-21 21:53:02 +01:00
parent ed3ad74a48
commit a9a7580c3f

View File

@ -5,7 +5,7 @@
, openldap, lttngUst , openldap, lttngUst
, babeltrace, gperf , babeltrace, gperf
, cunit, snappy , cunit, snappy
, rocksdb , rocksdb, makeWrapper
# Optional Dependencies # Optional Dependencies
, yasm ? null, fcgi ? null, expat ? null , yasm ? null, fcgi ? null, expat ? null
@ -97,6 +97,7 @@ let
ps.pecan ps.pecan
ps.prettytable ps.prettytable
ps.webob ps.webob
ps.cherrypy
]); ]);
in in
@ -114,7 +115,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig which git python2Packages.wrapPython pkgconfig which git python2Packages.wrapPython makeWrapper
(ensureNewerSourcesHook { year = "1980"; }) (ensureNewerSourcesHook { year = "1980"; })
]; ];
@ -159,6 +160,7 @@ stdenv.mkDerivation {
postFixup = '' postFixup = ''
wrapPythonPrograms wrapPythonPrograms
wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/lib/python2.7/site-packages
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;