Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 08:46:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2436 from isabelroses/nix/prefer-hostplatforn

Browse Source 
refactor(nix): stdenv.isX -> stdenv.hostPlatform.isX
This commit is contained in:
Mitchell Hashimoto
2024-10-14 09:46:25 -07:00
committed by GitHub
parent 0cf12cd88b 02be641358
commit 10aad444b7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nix/devShell.nix
View File

@ -53,7 +53,7 @@
[ [
libGL libGL
] ]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
bzip2 bzip2
expat expat
fontconfig fontconfig
@ -106,7 +106,7 @@ in
wabt wabt
wasmtime wasmtime
] ]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
# My nix shell environment installs the non-interactive version # My nix shell environment installs the non-interactive version
# by default so we have to include this. # by default so we have to include this.
bashInteractive bashInteractive
@ -148,7 +148,7 @@ in
# On Linux we need to setup the environment so that all GTK data # On Linux we need to setup the environment so that all GTK data
# is available (namely icons). # is available (namely icons).
shellHook = lib.optionalString stdenv.isLinux '' shellHook = lib.optionalString stdenv.hostPlatform.isLinux ''
# Minimal subset of env set by wrapGAppsHook4 for icons and global settings # Minimal subset of env set by wrapGAppsHook4 for icons and global settings
export XDG_DATA_DIRS=$XDG_DATA_DIRS:${hicolor-icon-theme}/share:${gnome.adwaita-icon-theme}/share export XDG_DATA_DIRS=$XDG_DATA_DIRS:${hicolor-icon-theme}/share:${gnome.adwaita-icon-theme}/share
export XDG_DATA_DIRS=$XDG_DATA_DIRS:$GSETTINGS_SCHEMAS_PATH # from glib setup hook export XDG_DATA_DIRS=$XDG_DATA_DIRS:$GSETTINGS_SCHEMAS_PATH # from glib setup hook

4
nix/package.nix
View File

@ -126,7 +126,7 @@ in
[ [
libGL libGL
] ]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
bzip2 bzip2
expat expat
fontconfig fontconfig
@ -161,7 +161,7 @@ in
postInstall = '' postInstall = ''
terminfo_src=${ terminfo_src=${
if stdenv.isDarwin if stdenv.hostPlatform.isDarwin
then ''"$out/Applications/Ghostty.app/Contents/Resources/terminfo"'' then ''"$out/Applications/Ghostty.app/Contents/Resources/terminfo"''
else "$out/share/terminfo" else "$out/share/terminfo"
} }