guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 9650cad962ffc859d8454a4dc394439d728a8ec5 Author: Nikita Mitasov <[email protected]> AuthorDate: Sun Jul 13 18:16:01 2025 +0300 gnu: glibc: Add patch that fixes getconf PATH. * gnu/packages/patches/glibc-fix-path-attribute-in-getconf.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm (%glibc-patches): Use it. Change-Id: If5544936b9c3aa658641969f6468fe41d5746e1a Signed-off-by: Ludovic Courtès <[email protected]> Merges: #1219 --- gnu/local.mk | 2 ++ gnu/packages/base.scm | 2 ++ .../glibc-fix-path-attribute-in-getconf.patch | 23 ++++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/gnu/local.mk b/gnu/local.mk index fb291d8e4e1..1e660d83106 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -78,6 +78,7 @@ # Copyright © 2025 bdunahu <[email protected]> # Copyright © 2026 Simen Endsjø <[email protected]> # Copyright © 2026 Goran Vukoman <[email protected]> +# Copyright © 2025 Nikita Mitasov <[email protected]> # # This file is part of GNU Guix. # @@ -1509,6 +1510,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-cross-objdump.patch \ %D%/packages/patches/glibc-dl-cache.patch \ %D%/packages/patches/glibc-guix-locpath.patch \ + %D%/packages/patches/glibc-fix-path-attribute-in-getconf.patch \ %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \ %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch \ %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 6fa024b2168..56ddcbd1129 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2022, 2026 John Kehayias <[email protected]> ;;; Copyright © 2023 Josselin Poiret <[email protected]> ;;; Copyright © 2024, 2025 Zheng Junjie <[email protected]> +;;; Copyright © 2025 Nikita Mitasov <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -908,6 +909,7 @@ the store.") (list "glibc-ldd-powerpc.patch" "glibc-2.41-ldd-x86_64.patch" "glibc-2.40-dl-cache.patch" + "glibc-fix-path-attribute-in-getconf.patch" "glibc-2.37-versioned-locpath.patch" ;; "glibc-allow-kernel-2.6.32.patch" "glibc-guix-locpath.patch" diff --git a/gnu/packages/patches/glibc-fix-path-attribute-in-getconf.patch b/gnu/packages/patches/glibc-fix-path-attribute-in-getconf.patch new file mode 100644 index 00000000000..e423d48bb44 --- /dev/null +++ b/gnu/packages/patches/glibc-fix-path-attribute-in-getconf.patch @@ -0,0 +1,23 @@ +This patch is based on patch from NixOS/nixpkgs +pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch + +It adjusts the CS_PATH definition in sysdeps/unix/confstr.h so that getconf PATH +includes /run/current-system/profile/bin, which is where Guix stores profile binaries. +Unlike traditional distributions, Guix does not use /bin or /usr/bin as actual locations +for executables. This change ensures that tools and scripts relying on getconf PATH +receive a correct and functional PATH. + + +From bff411feec1f381a51d7127971e5d6fda1167254 Mon Sep 17 00:00:00 2001 +From: Nikita Mitasov <[email protected]> +Date: Sun, 13 Jul 2025 17:48:19 +0300 +Subject: [PATCH] Add Guix profile path to getconf + + +diff --git a/sysdeps/unix/confstr.h b/sysdeps/unix/confstr.h +index 15859c3b..837837c7 100644 +--- a/sysdeps/unix/confstr.h ++++ b/sysdeps/unix/confstr.h +@@ -1 +1 @@ +-#define CS_PATH "/bin:/usr/bin" ++#define CS_PATH "/run/current-system/profile/bin:/bin:/usr/bin"
