From 5a3ba0e2952adeb5a0cad5eadf302ed20c9248d7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 12 May 2020 03:58:46 +1000 Subject: [PATCH] skopeo: add wrapper wrap fuse-overlayfs for storage compatibility with the podman wrapper --- pkgs/development/tools/skopeo/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index f7e1478bbec..1d4afc0a4ec 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -10,6 +10,8 @@ , libselinux , go-md2man , installShellFiles +, makeWrapper +, fuse-overlayfs }: let @@ -38,7 +40,7 @@ buildGoPackage { excludedPackages = [ "integration" ]; - nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; + nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; buildInputs = [ gpgme ] ++ stdenv.lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; @@ -56,6 +58,11 @@ buildGoPackage { popd ''; + postInstall = stdenv.lib.optionals stdenv.isLinux '' + wrapProgram $out/bin/skopeo \ + --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} + ''; + meta = with stdenv.lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo";