Unverified Commit 21906f97 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

buildah(-wrapped): fix build (on aarch64-darwin) (#461705)

parents 224fa5bc dfb4595e

pkgs/by-name/bu/buildah-unwrapped/package.nix

+6 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
  libapparmor,

  libselinux,

  libseccomp,

  writableTmpDirAsHomeHook,

  versionCheckHook,

}:
@@ -69,8 +70,12 @@ buildGoModule (finalAttrs: { 
  '';



  doInstallCheck = true;

  nativeInstallCheckInputs = [ versionCheckHook ];

  nativeInstallCheckInputs = [

    writableTmpDirAsHomeHook

    versionCheckHook

  ];

  versionCheckProgramArg = "--version";

  versionCheckKeepEnvironment = [ "HOME" ];



  meta = {

    description = "Tool which facilitates building OCI images";

pkgs/by-name/bu/buildah/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -74,5 +74,5 @@ runCommand buildah-unwrapped.name 
    ln -s ${buildah-unwrapped}/share $out/share

    makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \

      --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \

      --prefix PATH : ${binPath}

      --prefix PATH : "${binPath}"

  ''