From 95a44252d15b3068fa637ca9f7a7df4205cf8278 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 23 Mar 2026 11:05:55 +0100 Subject: [PATCH] glibc,iconv,libc,mtrace: move NIX_NO_SELF_RPATH into env glibc/locales.nix and gcc have it in env as well. --- pkgs/development/libraries/glibc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index b62bac16e287..4fea97b7408d 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -42,8 +42,6 @@ in # override the patches in `common.nix` -- so instead you should # write `patches = (previousAttrs.patches or []) ++ [ ... ]`. - NIX_NO_SELF_RPATH = true; - postConfigure = '' # Hack: get rid of the `-static' flag set by the bootstrap stdenv. # This has to be done *after* `configure' because it builds some @@ -68,6 +66,8 @@ in ]; env = (previousAttrs.env or { }) // { + NIX_NO_SELF_RPATH = true; + NIX_CFLAGS_COMPILE = (previousAttrs.env.NIX_CFLAGS_COMPILE or "") + lib.concatStringsSep " " (