commit: 07202f3ff2e3278c8998130f296b1b0f3e3dda98 Author: Sergei Trofimovich <slyich <AT> gmail <DOT> com> AuthorDate: Sun Dec 11 13:19:08 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 5 00:31:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07202f3f
profiles: unset GDK_PIXBUF_MODULE_FILE `GDK_PIXBUF_MODULE_FILE` is one of variables used to redirect `librsvg` plugins. Avoid clobber if that variables set by `guix environment` and other redirectors like in https://github.com/trofi/nix-guix-gentoo/issues/25 Closes: https://bugs.gentoo.org/887253 Signed-off-by: Sergei Trofimovich <slyich <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> profiles/base/make.defaults | 2 +- profiles/embedded/make.defaults | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 332b189ec623..d7bc0fde9322 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -43,7 +43,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" # GOBIN needs to be cleaned as random values in GOBIN can affect the # building of some packages: # https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0 -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" +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" # Variables that are set exclusively by the profile # and not by user configuration files. diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults index 050826ef6951..5b6dc2b40640 100644 --- a/profiles/embedded/make.defaults +++ b/profiles/embedded/make.defaults @@ -70,7 +70,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" # GOBIN needs to be cleaned as random values in GOBIN can affect the # building of some packages: # https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0 -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" +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" # Tiziano Müller <[email protected]> (2010-01-24) # We usually don't want python to (re)write .py[co] files during phase runs
