From 32d6e5806973c95050c26845ae4de3f7861a8678 Mon Sep 17 00:00:00 2001 From: Qyriad Date: Sun, 17 Mar 2024 10:05:18 -0600 Subject: [PATCH] flake: fix musl static stdenv devShell (fix nix flake check) pkgs.pkgsStatic.glibcLocales is null, so the string coercion was failing for devShells against static stdenvs Change-Id: Iee8e1042a852133ce0432627d72a85e97c17055e --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 62037e1e3..11c461896 100644 --- a/flake.nix +++ b/flake.nix @@ -328,9 +328,6 @@ installFlags = "sysconfdir=$(out)/etc"; strictDeps = false; - # Required to make non-NixOS Linux not complain about missing locale files during configure in a dev shell - ${if stdenv.isLinux then "LOCALE_ARCHIVE" else null} = "${pkgs.glibcLocales}/lib/locale/locale-archive"; - shellHook = '' PATH=$prefix/bin:$PATH unset PYTHONPATH @@ -339,6 +336,9 @@ # Make bash completion work. XDG_DATA_DIRS+=:$out/share ''; + } // lib.optionalAttrs (stdenv.isLinux && pkgs.glibcLocales != null) { + # Required to make non-NixOS Linux not complain about missing locale files during configure in a dev shell + LOCALE_ARCHIVE = "${lib.getLib pkgs.glibcLocales}/lib/locale/locale-archive"; }); in forAllSystems (system: