Get wayland-session wrapper from environment. diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c index 3b83fcd3..e60e6a57 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c @@ -2933,8 +2933,9 @@ gdm_session_start_session (GdmSession *self, allow_remote_connections? "--allow-remote-connections " : "", command); } else { - program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"%s\"", + program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"%s %s\"", register_session ? "--register-session " : "", + g_getenv ("GDM_WAYLAND_SESSION"), command); } } else if (run_xsession_script) { @@ -2965,8 +2966,9 @@ gdm_session_start_session (GdmSession *self, register_session ? "--register-session " : "", self->selected_program); } else { - program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"", + program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s %s\"", register_session ? "--register-session " : "", + g_getenv ("GDM_WAYLAND_SESSION"), self->selected_program); } } else { =''/>
path: root/gnu/packages/axoloti.scm
AgeCommit message (Expand)Author
2023-09-25gnu: embedded: Turn packages using top-level variables into procedures....Fixes <https://issues.guix.gnu.org/65716>. Before this change, simply adding the following import: modified gnu/packages/firmware.scm @@ -42,6 +42,7 @@ (define-module (gnu packages firmware) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages assembly) + #:use-module (gnu packages avr) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) Would cause byte compilation and/or evaluation to fail due to a circular module dependency. * gnu/packages/embedded.scm: Add commentary. (gcc-arm-none-eabi-4.9, gcc-arm-none-eabi-6, newlib-arm-none-eabi) (newlib-nano-arm-none-eabi, gcc-arm-none-eabi-7-2018-q2-update) (newlib-arm-none-eabi-7-2018-q2-update) (newlib-nano-arm-none-eabi-7-2018-q2-update) (arm-none-eabi-toolchain-4.9, arm-none-eabi-nano-toolchain-4.9) (arm-none-eabi-toolchain-6, arm-none-eabi-nano-toolchain-6) (arm-none-eabi-toolchain-7-2018-q2-update, gdb-arm-none-eabi) (propeller-binutils, propeller-gcc-6, propeller-gcc-4) (propeller-gcc, propeller-toolchain, propeller-development-suite) (gcc-vc4): Turn into procedures, prefixing the procedure name with 'make-', and adjust all users. (make-libstdc++-arm-none-eabi) [arguments]: Avoid an unused warning. (arm-none-eabi-toolchain): Rename to... (make-arm-none-eabi-toolchain): ... this. * gnu/packages/raspberry-pi.scm (raspi-arm-chainloader) [native-inputs]: Replace gcc-arm-none-eabi-6 with (make-arm-none-eabi-toolchain). * gnu/packages/axoloti.scm (axoloti-runtime) [inputs]: Replace arm-none-eabi-nano-toolchain-4.9 with (make-arm-none-eabi-nano-toolchain-4.9). (axoloti-patcher): Likewise. (axoloti-patcher-next) [inputs]: Replace arm-none-eabi-nano-toolchain-7-2018-q2-update with (make-arm-none-eabi-nano-toolchain-7-2018-q2-update). Series-changes: 2 - Use mlambda for procedures Maxim Cournoyer
2023-01-08gnu: Move Java XML packages to new module....* gnu/packages/xml.scm (java-simple-xml, java-jaxp, java-apache-xml-commons-resolver, java-jaxen, java-xom, java-xsdlib, java-xpp3, java-xmlpull2, java-xmlpull-api-v1, java-dom4j, java-kxml2, java-stax, java-jettison, java-jdom2, java-xstream, java-mxparser): Move these variables from here... * gnu/packages/java-xml.scm: ...to this new file. * gnu/local.mk (GNU_SYSTEM_MODULES): Register new file. * gnu/packages/axoloti.scm, gnu/packages/batik.scm, gnu/packages/bioinformatics.scm, gnu/packages/groovy.scm, gnu/packages/java.scm, gnu/packages/maven.scm: Adjust module imports. Ricardo Wurmus
2022-11-11gnu: axoloti: Remove unused module import....* gnu/packages/axoloti.scm (axoloti-runtime, axoloti-patcher, axoloti-patcher-next)[arguments]: Don't import (guix build syscalls). Marius Bakke