diff options
| author | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-29 20:35:52 +0800 |
|---|---|---|
| committer | Ding Xiang Fei <dingxiangfei2009@gmail.com> | 2018-07-29 20:35:52 +0800 |
| commit | 3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd (patch) | |
| tree | 67390286586ef4af0342cfaf82962cfb96da9435 /pkgs/development/tools/skopeo/default.nix | |
| parent | a998a49ee4f2f0461a93e9c9524654b845a8139e (diff) | |
| parent | a2c6dbe370160ffea5537f64dda04489184c5ce1 (diff) | |
| download | nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.gz nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.bz2 nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.lz nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.xz nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.tar.zst nixlib-3a9d8a1ab43ed9f47e45c8b39d2a00e8ab29e4bd.zip | |
Merge branch 'master' into cross-compiling-postgresql
Diffstat (limited to 'pkgs/development/tools/skopeo/default.nix')
| -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 = '' |