From dfd6999195be22f095a10b7ecf9f64cdc93542e4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 15:49:19 +0100 Subject: [PATCH] haskellModules.haskellSrc2nix: move LANG and LOCALE_ARCHIVE into env --- pkgs/development/haskell-modules/make-package-set.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 4b66ccb6314f..8b72e52d2661 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -181,10 +181,12 @@ let nativeBuildInputs = [ buildPackages.cabal2nix-unwrapped ]; preferLocalBuild = true; allowSubstitutes = false; - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = pkgs.lib.optionalString ( - buildPlatform.libc == "glibc" - ) "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + env = { + LANG = "en_US.UTF-8"; + } + // lib.optionalAttrs (buildPlatform.libc == "glibc") { + LOCALE_ARCHIVE = "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + }; } '' export HOME="$TMP"