diff options
| author | isabel <isabel@isabelroses.com> | 2024-10-14 16:34:04 +0100 |
|---|---|---|
| committer | isabel <isabel@isabelroses.com> | 2024-10-14 16:39:28 +0100 |
| commit | 02be641358d36751460053d85e86355d303520b4 (patch) | |
| tree | 2b3548f93c1ff6831d512a3293ab3fdca4a4d28f /nix/devShell.nix | |
| parent | ccb97c6c3360474594ca50fa0dcda5bce597ca81 (diff) | |
refactor(nix): stdenv.isX -> stdenv.hostPlatform.isX
In preparation for the deprecation of `stdenv.isX`
https://github.com/NixOS/nixpkgs/commit/e0464e47880a69896f0fb1810f00e0de469f770a
Diffstat (limited to 'nix/devShell.nix')
| -rw-r--r-- | nix/devShell.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nix/devShell.nix b/nix/devShell.nix index 6a973d17a..ed83407fb 100644 --- a/nix/devShell.nix +++ b/nix/devShell.nix @@ -53,7 +53,7 @@ [ libGL ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ bzip2 expat fontconfig @@ -106,7 +106,7 @@ in wabt wasmtime ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # My nix shell environment installs the non-interactive version # by default so we have to include this. bashInteractive @@ -148,7 +148,7 @@ in # On Linux we need to setup the environment so that all GTK data # 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 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 |