public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41908 from nicknovitski/dockertools-darwin

Browse Source 
fix dockertools.pullImage on darwin
This commit is contained in:
Daniel Peebles
2018-07-27 23:42:56 -04:00
committed by GitHub
parent f460703211 c58b11d229
commit fe036ea2be
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/skopeo/default.nix
View File

@@ -28,7 +28,7 @@ buildGoPackage rec {
excludedPackages = "integration";
nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux ];
buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs ostree libselinux ];
buildFlagsArray = ''
-ldflags=
@@ -37,8 +37,8 @@ buildGoPackage rec {
'';
preBuild = ''
export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev lvm2}/include -I${getDev btrfs-progs}/include"
export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib lvm2}/lib"
export CGO_CFLAGS="$CFLAGS"
export CGO_LDFLAGS="$LDFLAGS"
'';
postBuild = ''