diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-04-19 18:12:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-19 18:12:50 +0100 |
| commit | d96959a6296b8ff44787236ee4ba138678360543 (patch) | |
| tree | 2a095367c59d13f94cedd24c8d1fa72b4558217b /pkgs/development/tools | |
| parent | 2c74cdac47e17fff9c0b0e7554bbcbdf319cbcdd (diff) | |
| parent | c34bc1d8240d38f54b34569f09bffc4f0f5e8662 (diff) | |
| download | nixlib-d96959a6296b8ff44787236ee4ba138678360543.tar nixlib-d96959a6296b8ff44787236ee4ba138678360543.tar.gz nixlib-d96959a6296b8ff44787236ee4ba138678360543.tar.bz2 nixlib-d96959a6296b8ff44787236ee4ba138678360543.tar.lz nixlib-d96959a6296b8ff44787236ee4ba138678360543.tar.xz nixlib-d96959a6296b8ff44787236ee4ba138678360543.tar.zst nixlib-d96959a6296b8ff44787236ee4ba138678360543.zip | |
Merge pull request #85414 from zowoq/skopeo
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/skopeo/default.nix | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 4425640828cc..7d4e4e0c69ed 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , buildGoPackage , fetchFromGitHub , runCommand @@ -10,10 +9,9 @@ , pkg-config , libselinux , go-md2man +, installShellFiles }: -with stdenv.lib; - let version = "0.2.0"; @@ -28,6 +26,8 @@ let goPackagePath = "github.com/containers/skopeo"; + vendorPath = "${goPackagePath}/vendor/github.com/containers/image/v5"; + in buildGoPackage { pname = "skopeo"; @@ -36,26 +36,23 @@ 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 installShellFiles ]; + 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 = '' # depends on buildGoPackage not changing … pushd ./go/src/${goPackagePath} make install-docs MANINSTALLDIR="$man/share/man" + installShellCompletion --bash completions/bash/skopeo popd ''; |