Merge pull request #37597 from lejonet/ceph-#36622
ceph: Add makeWrapper to dependencies and nativeBuildInputs
This commit is contained in:
commit
1a44de831a
@ -5,7 +5,7 @@
|
||||
, openldap, lttngUst
|
||||
, babeltrace, gperf
|
||||
, cunit, snappy
|
||||
, rocksdb
|
||||
, rocksdb, makeWrapper
|
||||
|
||||
# Optional Dependencies
|
||||
, yasm ? null, fcgi ? null, expat ? null
|
||||
@ -96,6 +96,7 @@ let
|
||||
ps.pecan
|
||||
ps.prettytable
|
||||
ps.webob
|
||||
ps.cherrypy
|
||||
]);
|
||||
|
||||
in
|
||||
@ -113,7 +114,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkgconfig which git python2Packages.wrapPython
|
||||
pkgconfig which git python2Packages.wrapPython makeWrapper
|
||||
(ensureNewerSourcesHook { year = "1980"; })
|
||||
];
|
||||
|
||||
@ -158,6 +159,7 @@ stdenv.mkDerivation {
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonPrograms
|
||||
wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/${python2Packages.python.sitePackages}
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
Loading…
Reference in New Issue
Block a user