From 8746d3caee7a256a2a1638da3e357ae666a6f47d Mon Sep 17 00:00:00 2001 From: Matthew Donoughe Date: Mon, 16 Feb 2026 17:28:13 -0500 Subject: [PATCH] glibc: set default zonedir to match fhs --- pkgs/development/libraries/glibc/common.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 9b2946d019fb..533a4b453909 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -208,7 +208,12 @@ stdenv.mkDerivation ( makeFlags = (args.makeFlags or [ ]) - ++ [ "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" ] + ++ [ + "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + # zonedir does nothing on NixOS but is important for non-NixOS. + # See https://github.com/NixOS/nixpkgs/pull/491193 + "zonedir=/usr/share/zoneinfo" + ] ++ lib.optionals (stdenv.cc.libc != null) [ "BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib" "OBJDUMP=${stdenv.cc.bintools.bintools}/bin/objdump"