diff options
author | Qyriad <qyriad@qyriad.me> | 2024-03-17 10:05:18 -0600 |
---|---|---|
committer | Qyriad <qyriad@qyriad.me> | 2024-03-17 10:05:18 -0600 |
commit | 32d6e5806973c95050c26845ae4de3f7861a8678 (patch) | |
tree | a97e0269b61cb6ccf08cd87cfa06df5a7a4c66db | |
parent | 11f35afa6f7933d1640e55473a8c7a153bf89b14 (diff) |
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
-rw-r--r-- | flake.nix | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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: |