| 1 |
From: Sergei Trofimovich <slyich@×××××.com> |
| 2 |
|
| 3 |
`GDK_PIXBUF_MODULE_FILE` is one of variables used to redirect `librsvg` |
| 4 |
plugins. Avoid clobber if that variables set by `guix environment` and |
| 5 |
other redirectors like in https://github.com/trofi/nix-guix-gentoo/issues/25 |
| 6 |
|
| 7 |
Closes: https://bugs.gentoo.org/887253 |
| 8 |
Signed-off-by: Sergei Trofimovich <slyich@×××××.com> |
| 9 |
Signed-off-by: Sam James <sam@g.o> |
| 10 |
--- |
| 11 |
profiles/base/make.defaults | 2 +- |
| 12 |
profiles/embedded/make.defaults | 2 +- |
| 13 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults |
| 16 |
index 332b189ec6236..d7bc0fde9322a 100644 |
| 17 |
--- a/profiles/base/make.defaults |
| 18 |
+++ b/profiles/base/make.defaults |
| 19 |
@@ -43,7 +43,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" |
| 20 |
# GOBIN needs to be cleaned as random values in GOBIN can affect the |
| 21 |
# building of some packages: |
| 22 |
# https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0 |
| 23 |
-ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" |
| 24 |
+ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME GDK_PIXBUF_MODULE_FILE XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" |
| 25 |
|
| 26 |
# Variables that are set exclusively by the profile |
| 27 |
# and not by user configuration files. |
| 28 |
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults |
| 29 |
index 050826ef6951e..5b6dc2b406404 100644 |
| 30 |
--- a/profiles/embedded/make.defaults |
| 31 |
+++ b/profiles/embedded/make.defaults |
| 32 |
@@ -70,7 +70,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" |
| 33 |
# GOBIN needs to be cleaned as random values in GOBIN can affect the |
| 34 |
# building of some packages: |
| 35 |
# https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0 |
| 36 |
-ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" |
| 37 |
+ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME GDK_PIXBUF_MODULE_FILE XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" |
| 38 |
|
| 39 |
# Tiziano Müller <dev-zero@g.o> (2010-01-24) |
| 40 |
# We usually don't want python to (re)write .py[co] files during phase runs |
| 41 |
-- |
| 42 |
2.39.0 |
Archives