philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

flake: fix musl static stdenv devShell (fix nix flake check)

Browse source 
pkgs.pkgsStatic.glibcLocales is null, so the string coercion was failing
for devShells against static stdenvs

Change-Id: Iee8e1042a852133ce0432627d72a85e97c17055e
This commit is contained in:
Qyriad 2024-03-17 10:05:18 -06:00
parent 11f35afa6f
commit 32d6e58069
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -328,9 +328,6 @@
installFlags = "sysconfdir=$(out)/etc"; installFlags = "sysconfdir=$(out)/etc";
strictDeps = false; 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 = '' shellHook = ''
PATH=$prefix/bin:$PATH PATH=$prefix/bin:$PATH
unset PYTHONPATH unset PYTHONPATH
@ -339,6 +336,9 @@
# Make bash completion work. # Make bash completion work.
XDG_DATA_DIRS+=:$out/share 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 in
forAllSystems (system: forAllSystems (system: