Grimmauld/home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Replace pkgs.hostPlatform by pkgs.stdenv.hostPlatform

Browse source 
We are attempting to deprecate these top-level attributes in upstream
Nixpkgs.

See also bc0acdad8c.
This commit is contained in:
Ryan Burns 2021-12-02 21:30:34 -08:00 committed by Robert Helgesson
parent 1aaa1a033b
commit 781d25b315
Failed to generate hash of commit
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/config/i18n.nix
View file

@ -36,7 +36,7 @@ let
in { in {
meta.maintainers = with maintainers; [ midchildan ]; meta.maintainers = with maintainers; [ midchildan ];
config = mkIf pkgs.hostPlatform.isLinux { config = mkIf pkgs.stdenv.hostPlatform.isLinux {
# For shell sessions. # For shell sessions.
home.sessionVariables = localeVars; home.sessionVariables = localeVars;

2
modules/misc/xdg-mime.nix
View file

@ -10,7 +10,7 @@ in {
options = { options = {
xdg.mime.enable = mkOption { xdg.mime.enable = mkOption {
type = types.bool; type = types.bool;
default = pkgs.hostPlatform.isLinux; default = pkgs.stdenv.hostPlatform.isLinux;
defaultText = defaultText =
literalExpression "true if host platform is Linux, false otherwise"; literalExpression "true if host platform is Linux, false otherwise";
description = '' description = ''

6
modules/services/window-managers/xmonad.nix
View file

@ -132,9 +132,9 @@ in {
# The resulting binary name depends on the arch and os # The resulting binary name depends on the arch and os
# https://github.com/xmonad/xmonad/blob/56b0f850bc35200ec23f05c079eca8b0a1f90305/src/XMonad/Core.hs#L565-L572 # https://github.com/xmonad/xmonad/blob/56b0f850bc35200ec23f05c079eca8b0a1f90305/src/XMonad/Core.hs#L565-L572
mv "$XMONAD_DATA_DIR/xmonad-${pkgs.hostPlatform.system}" $out/bin/ mv "$XMONAD_DATA_DIR/xmonad-${pkgs.stdenv.hostPlatform.system}" $out/bin/
'' ''
}/bin/xmonad-${pkgs.hostPlatform.system}"; }/bin/xmonad-${pkgs.stdenv.hostPlatform.system}";
in mkIf cfg.enable (mkMerge [ in mkIf cfg.enable (mkMerge [
{ {
@ -157,7 +157,7 @@ in {
(mkIf (cfg.config != null) { (mkIf (cfg.config != null) {
xsession.windowManager.command = xmonadBin; xsession.windowManager.command = xmonadBin;
home.file.".xmonad/xmonad.hs".source = cfg.config; home.file.".xmonad/xmonad.hs".source = cfg.config;
home.file.".xmonad/xmonad-${pkgs.hostPlatform.system}" = { home.file.".xmonad/xmonad-${pkgs.stdenv.hostPlatform.system}" = {
source = xmonadBin; source = xmonadBin;
onChange = '' onChange = ''
# Attempt to restart xmonad if X is running. # Attempt to restart xmonad if X is running.

2
modules/targets/darwin/fonts.nix
View file

@ -12,7 +12,7 @@ let
fonts = "${fontsEnv}/share/fonts"; fonts = "${fontsEnv}/share/fonts";
in { in {
# macOS won't recognize symlinked fonts # macOS won't recognize symlinked fonts
config = mkIf pkgs.hostPlatform.isDarwin { config = mkIf pkgs.stdenv.hostPlatform.isDarwin {
home.activation.copyFonts = hm.dag.entryAfter [ "writeBoundary" ] '' home.activation.copyFonts = hm.dag.entryAfter [ "writeBoundary" ] ''
copyFonts() { copyFonts() {
rm -rf ${homeDir}/Library/Fonts/HomeManager || : rm -rf ${homeDir}/Library/Fonts/HomeManager || :