From 1ad3b685f4c82a4d830b57e493d2247898b5f685 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:01 +1000 Subject: [PATCH] podman: switch to buildGoModule --- pkgs/applications/virtualization/podman/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index d5c52a8dfe8a..995d571a1922 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , pkg-config , installShellFiles -, buildGoPackage +, buildGoModule , gpgme , lvm2 , btrfs-progs @@ -12,7 +12,7 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "podman"; version = "1.9.2"; @@ -23,7 +23,7 @@ buildGoPackage rec { sha256 = "0jvqzn1q52z6aka98d2i3dyn2i8xld7xvmi2zfxgm9g53wdgi2g2"; }; - goPackagePath = "github.com/containers/libpod"; + vendorSha256 = null; outputs = [ "out" "man" ]; @@ -32,7 +32,6 @@ buildGoPackage rec { buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ]; buildPhase = '' - pushd go/src/${goPackagePath} patchShebangs . ${if stdenv.isDarwin then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all"