From da3c625f7c5bbaa52af4abc4965da8f82b7315ec Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sun, 12 Jan 2025 21:17:01 -0700 Subject: [PATCH] libcap: use correct cross golang cross compiler --- pkgs/by-name/li/libcap/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index a15873a49c02..f648e896d262 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -1,7 +1,8 @@ { stdenv, lib, buildPackages, fetchurl, runtimeShell +, pkgsBuildHost , usePam ? !isStatic, pam ? null , isStatic ? stdenv.hostPlatform.isStatic -, withGo ? go.meta.available, go +, withGo ? pkgsBuildHost.go.meta.available # passthru.tests , bind @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = lib.optionals withGo [ - go + pkgsBuildHost.go ]; buildInputs = lib.optional usePam pam; @@ -50,8 +51,8 @@ stdenv.mkDerivation rec { "GOLANG=yes" ''GOCACHE=''${TMPDIR}/go-cache'' "GOFLAGS=-trimpath" - "GOARCH=${go.GOARCH}" - "GOOS=${go.GOOS}" + "GOARCH=${pkgsBuildHost.go.GOARCH}" + "GOOS=${pkgsBuildHost.go.GOOS}" ] ++ lib.optionals isStatic [ "SHARED=no" "LIBCSTATIC=yes" ]; postPatch = '' @@ -87,7 +88,7 @@ stdenv.mkDerivation rec { strictDeps = true; disallowedReferences = lib.optionals withGo [ - go + pkgsBuildHost.go ]; passthru.tests = {