Commit 1d6f6c0e authored by zowoq's avatar zowoq
Browse files

buildah: refactor wrapper 

- also move `preferLocalBuild` out of let..in
parent a0c079f6

pkgs/development/tools/buildah/wrapper.nix

+7 −10
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
, lib

, stdenv

, extraPackages ? []

, buildah

, runc # Default container runtime

, crun # Container runtime (default with cgroups v2 for podman/buildah)

, conmon # Container runtime monitor
@@ -15,10 +14,6 @@ 
}:



let

  buildah = buildah-unwrapped;



  preferLocalBuild = true;



  binPath = lib.makeBinPath ([

  ] ++ lib.optionals stdenv.isLinux [

    runc
@@ -30,11 +25,13 @@ let 
    iptables

  ] ++ extraPackages);



in runCommand buildah.name {

  name = "${buildah.pname}-wrapper-${buildah.version}";

  inherit (buildah) pname version;

in runCommand buildah-unwrapped.name {

  name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}";

  inherit (buildah-unwrapped) pname version;



  preferLocalBuild = true;



  meta = builtins.removeAttrs buildah.meta [ "outputsToInstall" ];

  meta = builtins.removeAttrs buildah-unwrapped.meta [ "outputsToInstall" ];



  outputs = [

    "out"
@@ -46,7 +43,7 @@ in runCommand buildah.name { 
  ];



} ''

  ln -s ${buildah.man} $man

  ln -s ${buildah-unwrapped.man} $man



  mkdir -p $out/bin

  ln -s ${buildah-unwrapped}/share $out/share