diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-06-11 10:49:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 10:49:40 -0500 |
| commit | 656783a3d1864fc94ed4183c267f641e644640d0 (patch) | |
| tree | b097fa2f314b9fa498170661b524ac0efc821d78 /pkgs/os-specific/linux | |
| parent | 2c7ec299fa29903cf0c93cb1d090dc2c85011c47 (diff) | |
| parent | 8ae7ac9e8c959cf0524331550f858549edd5152e (diff) | |
| download | nixlib-656783a3d1864fc94ed4183c267f641e644640d0.tar nixlib-656783a3d1864fc94ed4183c267f641e644640d0.tar.gz nixlib-656783a3d1864fc94ed4183c267f641e644640d0.tar.bz2 nixlib-656783a3d1864fc94ed4183c267f641e644640d0.tar.lz nixlib-656783a3d1864fc94ed4183c267f641e644640d0.tar.xz nixlib-656783a3d1864fc94ed4183c267f641e644640d0.tar.zst nixlib-656783a3d1864fc94ed4183c267f641e644640d0.zip | |
Merge pull request #89540 from Patryk27/fixes/lxd-lxcfs
Fix `lxd`, so that it works with `lxcfs`
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/lxcfs/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 68d05f0be65d..4011b3885625 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,4 +1,5 @@ { config, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse +, utillinux, makeWrapper , enableDebugBuild ? config.lxcfs.enableDebugBuild or false }: with stdenv.lib; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; - buildInputs = [ fuse ]; + buildInputs = [ fuse makeWrapper ]; preConfigure = stdenv.lib.optionalString enableDebugBuild '' sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am @@ -27,6 +28,12 @@ stdenv.mkDerivation rec { installFlags = [ "SYSTEMD_UNIT_DIR=\${out}/lib/systemd" ]; + postInstall = '' + # `mount` hook requires access to the `mount` command from `utillinux`: + wrapProgram "$out/share/lxcfs/lxc.mount.hook" \ + --prefix PATH : "${utillinux}/bin" + ''; + postFixup = '' # liblxcfs.so is reloaded with dlopen() patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs" |