diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 4425640828c..c18a767928e 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , buildGoPackage , fetchFromGitHub , runCommand @@ -12,8 +11,6 @@ , go-md2man }: -with stdenv.lib; - let version = "0.2.0"; @@ -28,6 +25,8 @@ let goPackagePath = "github.com/containers/skopeo"; + vendorPath = "${goPackagePath}/vendor/github.com/containers/image/v5"; + in buildGoPackage { pname = "skopeo"; @@ -36,20 +35,16 @@ buildGoPackage { outputs = [ "bin" "man" "out" ]; - excludedPackages = "integration"; + excludedPackages = [ "integration" ]; - nativeBuildInputs = [ pkg-config (lib.getBin go-md2man) ]; - buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; + nativeBuildInputs = [ pkg-config go-md2man ]; + buildInputs = [ gpgme ] + ++ stdenv.lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; buildFlagsArray = '' -ldflags= - -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/signature.systemDefaultPolicyPath=${defaultPolicyFile} - -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/internal/tmpdir.unixTempDirForBigFiles=/tmp - ''; - - preBuild = '' - export CGO_CFLAGS="$CFLAGS" - export CGO_LDFLAGS="$LDFLAGS" + -X ${vendorPath}/signature.systemDefaultPolicyPath=${defaultPolicyFile} + -X ${vendorPath}/internal/tmpdir.unixTempDirForBigFiles=/tmp ''; postBuild = ''