From 39741128d3775d198dbee34dc827353bfd18acd8 Mon Sep 17 00:00:00 2001
From: Carl Dong <contact@carldong.me>
Date: Wed, 17 Mar 2021 13:03:46 -0400
Subject: [PATCH] guix: Supply --link-profile

---
 contrib/guix/guix-build | 1 +
 depends/Makefile        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
index a1c120f412..6c0930df18 100755
--- a/contrib/guix/guix-build
+++ b/contrib/guix/guix-build
@@ -317,6 +317,7 @@ EOF
                                  ${SDK_PATH:+--share="$SDK_PATH"} \
                                  --cores="$JOBS" \
                                  --keep-failed \
+                                 --link-profile \
                                  ${SUBSTITUTE_URLS:+--substitute-urls="$SUBSTITUTE_URLS"} \
                                  ${ADDITIONAL_GUIX_COMMON_FLAGS} ${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS} \
                                  -- env HOST="$host" \
diff --git a/depends/Makefile b/depends/Makefile
index 4cd4d72fc2..dadb21515a 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -141,8 +141,8 @@ build_id_string+=system_clang
 $(host_arch)_$(host_os)_id_string+=system_clang
 endif
 
-build_id_string+=GUIX_ENVIRONMENT=$(GUIX_ENVIRONMENT)
-$(host_arch)_$(host_os)_id_string+=GUIX_ENVIRONMENT=$(GUIX_ENVIRONMENT)
+build_id_string+=GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))
+$(host_arch)_$(host_os)_id_string+=GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))
 
 qrencode_packages_$(NO_QR) = $(qrencode_packages)