Skip to content

Commit a60d431

Browse files
committed
guix: bump time-machine to 2a5297fd4ac9c3f4a7f869097f47ba0029c196ec
1 parent 4e93cdc commit a60d431

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

contrib/guix/guix-build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ EOF
452452
--keep-failed \
453453
--fallback \
454454
--link-profile \
455+
--writable-root \
455456
--root="$(profiledir_for_host "${HOST}")" \
456457
${SUBSTITUTE_URLS:+--substitute-urls="$SUBSTITUTE_URLS"} \
457458
${ADDITIONAL_GUIX_COMMON_FLAGS} ${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS} \

contrib/guix/libexec/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ case "$HOST" in
132132
# See depends/hosts/darwin.mk for more details.
133133
;;
134134
*android*)
135-
export LD_LIBRARY_PATH="$(find /gnu/store -maxdepth 1 -name "*zlib*" | sort | head -n 1)/lib:$(find /gnu/store -maxdepth 1 -name "*gcc-11*-lib" | sort | head -n 1)/lib"
135+
export LD_LIBRARY_PATH="$(find /gnu/store -maxdepth 1 -name "*zlib*" | sort | head -n 1)/lib:$(find /gnu/store -maxdepth 1 -name "*gcc-14*-lib" | sort | head -n 1)/lib"
136136
;;
137137
*linux-gnu*)
138138
CROSS_GLIBC="$(store_path "glibc-cross-${HOST}")"

contrib/guix/libexec/prelude.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fi
5858
time-machine() {
5959
# shellcheck disable=SC2086
6060
guix time-machine --url=https://codeberg.org/guix/guix.git \
61-
--commit=9d09b0cf841fb657a1aec12e9bab68e00c2b493c \
61+
--commit=2a5297fd4ac9c3f4a7f869097f47ba0029c196ec \
6262
--cores="$JOBS" \
6363
--keep-failed \
6464
--fallback \

contrib/guix/patches/winpthreads-remap-guix-store.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ the package, map all guix store prefixes to something fixed, e.g. /usr.
66

77
--- a/mingw-w64-libraries/winpthreads/Makefile.in
88
+++ b/mingw-w64-libraries/winpthreads/Makefile.in
9-
@@ -478,7 +478,7 @@ top_build_prefix = @top_build_prefix@
9+
@@ -465,7 +465,7 @@ top_build_prefix = @top_build_prefix@
1010
top_builddir = @top_builddir@
1111
top_srcdir = @top_srcdir@
1212
SUBDIRS = . tests
13-
-AM_CFLAGS = -Wall -DWIN32_LEAN_AND_MEAN $(am__append_1)
14-
+AM_CFLAGS = -Wall -DWIN32_LEAN_AND_MEAN $(am__append_1) $(shell find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
13+
-AM_CFLAGS = $(am__append_1) $(am__append_3)
14+
+AM_CFLAGS = $(am__append_1) $(am__append_3) $(shell find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
1515
ACLOCAL_AMFLAGS = -I m4
1616
lib_LTLIBRARIES = libwinpthread.la
17-
include_HEADERS = include/pthread.h include/sched.h include/semaphore.h include/pthread_unistd.h include/pthread_time.h include/pthread_compat.h include/pthread_signal.h
17+
include_HEADERS = \

0 commit comments

Comments
 (0)