diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-11-16 12:37:23 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-11-17 07:51:53 +1000 |
| commit | 1d6f6c0ec656835191a2970b360fb3558c522f76 (patch) | |
| tree | b6d6fad246375bb177ad0b5d0daa163b812034be /pkgs/development/tools/buildah | |
| parent | a0c079f6521934632ec023a9f1a72855c452ea19 (diff) | |
buildah: refactor wrapper
- also move `preferLocalBuild` out of let..in
Diffstat (limited to 'pkgs/development/tools/buildah')
| -rw-r--r-- | pkgs/development/tools/buildah/wrapper.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index 858a422a34058..aa14a01b86448 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -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 |