Skip to content

Commit

Permalink
ceph: Add makeWrapper to dependencies and nativeBuildInputs
Browse files Browse the repository at this point in the history
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

(cherry picked from commit a9a7580)
  • Loading branch information
lejonet authored and Mic92 committed Mar 27, 2018
1 parent 22782ef commit 3830232
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions pkgs/tools/filesystems/ceph/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
, openldap, lttngUst
, babeltrace, gperf
, cunit, snappy
, rocksdb
, rocksdb, makeWrapper

# Optional Dependencies
, yasm ? null, fcgi ? null, expat ? null
Expand Down Expand Up @@ -97,6 +97,7 @@ let
ps.pecan
ps.prettytable
ps.webob
ps.cherrypy
]);

in
Expand All @@ -114,7 +115,7 @@ stdenv.mkDerivation {

nativeBuildInputs = [
cmake
pkgconfig which git python2Packages.wrapPython
pkgconfig which git python2Packages.wrapPython makeWrapper
(ensureNewerSourcesHook { year = "1980"; })
];

Expand Down Expand Up @@ -159,6 +160,7 @@ stdenv.mkDerivation {

postFixup = ''
wrapPythonPrograms
wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/lib/python2.7/site-packages
'';

enableParallelBuilding = true;
Expand Down

0 comments on commit 3830232

Please sign in to comment.