diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2021-11-16 11:00:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 11:00:55 +0100 |
| commit | a40917f3c0cc56d46ad12ab16fbeb00489a2bcef (patch) | |
| tree | 4573a1363fe0d329df1d95deb04454fa93ef620e | |
| parent | b81e66efeb5c38b7740de09a79d817cfbee6c741 (diff) | |
| parent | f74c838dbff7c8e508513af86c6e640aaa481eb0 (diff) | |
Merge pull request #146108 from poelzi/fix-ceph
ceph-client: fix copy of python modules
| -rw-r--r-- | pkgs/tools/filesystems/ceph/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 04774e851b3ec..913367084ed25 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -241,13 +241,14 @@ in rec { ceph-client = runCommand "ceph-client-${version}" { meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices/Cephfs"; } '' - mkdir -p $out/{bin,sbin,etc,${sitePackages},share/bash-completion/completions} + mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions} cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin cp -r ${ceph}/bin/rbd-replay* $out/bin - cp -r ${ceph}/sbin/mount.ceph $out/sbin - cp -r ${ceph}/sbin/mount.fuse.ceph $out/sbin - cp -r ${ceph}/${sitePackages} $out/${sitePackages} + cp -r ${ceph}/sbin/mount.ceph $out/bin + cp -r ${ceph}/sbin/mount.fuse.ceph $out/bin + ln -s bin $out/sbin + cp -r ${ceph}/${sitePackages}/* $out/${sitePackages} cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths substituteInPlace $out/bin/ceph --replace ${ceph} $out |