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

Merge pull request #37597 from lejonet/ceph-#36622

Browse Source 
ceph: Add makeWrapper to dependencies and nativeBuildInputs
This commit is contained in:
Jörg Thalheim 2018-03-27 10:55:12 +01:00 committed by GitHub
commit 1a44de831a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/filesystems/ceph/generic.nix
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
@ -96,6 +96,7 @@ let
ps.pecan ps.pecan
ps.prettytable ps.prettytable
ps.webob ps.webob
ps.cherrypy
]); ]);
in in
@ -113,7 +114,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig which git python2Packages.wrapPython pkgconfig which git python2Packages.wrapPython makeWrapper
(ensureNewerSourcesHook { year = "1980"; }) (ensureNewerSourcesHook { year = "1980"; })
]; ];
@ -158,6 +159,7 @@ stdenv.mkDerivation {
postFixup = '' postFixup = ''
wrapPythonPrograms wrapPythonPrograms
wrapProgram $out/bin/ceph-mgr --set PYTHONPATH $out/${python2Packages.python.sitePackages}
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;