@@ -1,5 +1,5 @@
11diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c
2−index 5de89d62..bf6bdb52 100644
2+index 43fd0563..4067bd36 100644
33--- a/app/flatpak-builtins-build-export.c
44+++ b/app/flatpak-builtins-build-export.c
55@@ -458,7 +458,7 @@ validate_desktop_file (GFile *desktop_file,
@@ -12,10 +12,10 @@ index 5de89d62..bf6bdb52 100644
1212 {
1313 if (!g_error_matches (local_error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT))
1414diff --git a/tests/libtest.sh b/tests/libtest.sh
15−index e64be49f..a9a53e12 100644
15+index acb2095b..b361da16 100644
1616--- a/tests/libtest.sh
1717+++ b/tests/libtest.sh
18−@@ -367,7 +367,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then
18+@@ -431,7 +431,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then
1919 # running installed-tests: assume we know what we're doing
2020 _flatpak_bwrap_works=true
2121 elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
@@ -24,7 +24,7 @@ index e64be49f..a9a53e12 100644
2424 _flatpak_bwrap_works=false
2525 else
2626 _flatpak_bwrap_works=true
27−@@ -440,7 +440,7 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \
27+@@ -504,7 +504,7 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \
2828 export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
2929 DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
3030
@@ -33,7 +33,7 @@ index e64be49f..a9a53e12 100644
3333 assert_not_reached "Failed to start dbus-daemon"
3434 fi
3535
36−@@ -449,7 +449,7 @@ gdb_bt () {
36+@@ -519,7 +519,7 @@ commit_to_path () {
3737 }
3838
3939 cleanup () {
@@ -43,10 +43,10 @@ index e64be49f..a9a53e12 100644
4343 fusermount -u $XDG_RUNTIME_DIR/doc || :
4444 kill $(jobs -p) &> /dev/null || true
4545diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh
46−index e51e21a6..7d39efb5 100755
46+index 612f914f..4b890da2 100755
4747--- a/tests/make-test-app.sh
4848+++ b/tests/make-test-app.sh
49−@@ -149,13 +149,13 @@ msgid "Hello world"
49+@@ -151,13 +151,13 @@ msgid "Hello world"
5050 msgstr "Hallo Welt"
5151 EOF
5252 mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES
@@ -63,10 +63,10 @@ index e51e21a6..7d39efb5 100755
6363 flatpak build-finish ${DIR}
6464 mkdir -p repos
6565diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh
66−index 5d2c309b..cf61a3cf 100755
66+index af289625..7db51c17 100755
6767--- a/tests/make-test-runtime.sh
6868+++ b/tests/make-test-runtime.sh
69−@@ -25,9 +25,10 @@ EOF
69+@@ -28,9 +28,10 @@ EOF
7070
7171 # On Debian derivatives, /usr/sbin and /sbin aren't in ordinary users'
7272 # PATHs, but ldconfig is kept in /sbin
@@ -78,7 +78,7 @@ index 5d2c309b..cf61a3cf 100755
7878 mkdir -p ${DIR}/usr/bin
7979 mkdir -p ${DIR}/usr/lib
8080 ln -s ../lib ${DIR}/usr/lib64
81−@@ -37,48 +38,24 @@ if test -f /sbin/ldconfig.real; then
81+@@ -40,40 +41,17 @@ if test -f /sbin/ldconfig.real; then
8282 else
8383 cp `which ldconfig` ${DIR}/usr/bin
8484 fi
@@ -129,11 +129,18 @@ index 5d2c309b..cf61a3cf 100755
129129 done
130130 ln -s bash ${DIR}/usr/bin/sh
131131
132+@@ -84,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA"
133+ EOF
134+ chmod a+x ${DIR}/usr/bin/runtime_hello.sh
135+
132136-# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but
133137-# the real en_US locale is often not available, because its in the
134138-# local archive.
135139-mkdir -p ${DIR}/usr/lib/locale/
136140-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
141++# We do not copy C.UTF8 locale because it is in locale archive and
142++# that is already copied with glibc.
143++
137144+mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store
138145+chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed
139146+find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths
@@ -142,10 +149,10 @@ index 5d2c309b..cf61a3cf 100755
142149 if [ x$COLLECTION_ID != x ]; then
143150 collection_args=--collection-id=${COLLECTION_ID}
144151diff --git a/tests/testlibrary.c b/tests/testlibrary.c
145−index 44ae28e3..76bf619f 100644
152+index 509ce6cc..6a333c9c 100644
146153--- a/tests/testlibrary.c
147154+++ b/tests/testlibrary.c
148−@@ -1343,7 +1343,7 @@ check_bwrap_support (void)
155+@@ -1399,7 +1399,7 @@ check_bwrap_support (void)
149156 {
150157 gint exit_code = 0;
151158 char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net",