skopeo: 0.1.29 -> 0.1.30
Skopeo used by our docker tools was patched to work in the build sandbox (it used /var/tmp which is not available in the sandbox). Since this temporary directory can now be set at build time, we remove the patch from our docker tools.
This commit is contained in:
committed by
Robin Gloster
parent
e22d072c64
commit
8f71ce7e80
@@ -5,13 +5,13 @@
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "0.1.29";
|
||||
version = "0.1.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "projectatomic";
|
||||
repo = "skopeo";
|
||||
sha256 = "1lhzbyj2mm25x12s7g2jx4v8w19izjwlgx4lml13r5yy1spn65k2";
|
||||
sha256 = "10lpiiki7mlhrp4bid40wys3lch7fars1whxsa5gy0frfgp89ghn";
|
||||
};
|
||||
|
||||
defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
|
||||
@@ -30,7 +30,11 @@ buildGoPackage rec {
|
||||
nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
|
||||
buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ];
|
||||
|
||||
buildFlagsArray = "-ldflags= -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}";
|
||||
buildFlagsArray = ''
|
||||
-ldflags=
|
||||
-X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}
|
||||
-X github.com/projectatomic/skopeo/vendor/github.com/containers/image/internal/tmpdir.unixTempDirForBigFiles=/tmp
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include"
|
||||
|
||||
Reference in New Issue
Block a user