diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2018-07-27 23:42:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-27 23:42:56 -0400 |
| commit | fe036ea2bedd9360592b9b2ca89c9583a29b72a6 (patch) | |
| tree | bb4e5ce329aec5c9d8109b98d2336e403f510215 /pkgs/development/tools | |
| parent | f4607032116308163c2ae95cc7303358370dc85b (diff) | |
| parent | c58b11d229f63a85ee1d05fc9940a20fa2b73975 (diff) | |
| download | nixlib-fe036ea2bedd9360592b9b2ca89c9583a29b72a6.tar nixlib-fe036ea2bedd9360592b9b2ca89c9583a29b72a6.tar.gz nixlib-fe036ea2bedd9360592b9b2ca89c9583a29b72a6.tar.bz2 nixlib-fe036ea2bedd9360592b9b2ca89c9583a29b72a6.tar.lz nixlib-fe036ea2bedd9360592b9b2ca89c9583a29b72a6.tar.xz nixlib-fe036ea2bedd9360592b9b2ca89c9583a29b72a6.tar.zst nixlib-fe036ea2bedd9360592b9b2ca89c9583a29b72a6.zip | |
Merge pull request #41908 from nicknovitski/dockertools-darwin
fix dockertools.pullImage on darwin
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/skopeo/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index dc157b672530..48f9822ad869 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -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 = '' |