Skip to content

Commit

Permalink
Fix zsh on macOS noci
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasjm committed Dec 12, 2024
1 parent 39958ea commit 8fd0c1c
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions modules/shells/zsh/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
{ callPackage
, glibc
{ glibc
, lib
, makeWrapper
, oh-my-zsh
, runCommand
, stdenv
, zsh
}:

let
extraPaths = lib.optionals (!stdenv.targetPlatform.isDarwin) [glibc.bin];

in

stdenv.mkDerivation {
pname = "zsh";
version = zsh.version;
Expand All @@ -34,7 +37,7 @@ stdenv.mkDerivation {
echo "[ -f ~/.zshrc ] && source ~/.zshrc" >> .zshrc
makeWrapper ${zsh}/bin/zsh $out/bin/zsh-with-theme \
--prefix PATH : ${lib.makeBinPath [glibc.bin]} \
--prefix PATH : ${lib.makeBinPath extraPaths}
--set ZDOTDIR $out
'';

Expand Down

0 comments on commit 8fd0c1c

Please sign in to comment.