mirror of
https://github.com/nix-community/home-manager.git
synced 2026-01-11 17:39:37 +08:00
Replace pkgs.hostPlatform by pkgs.stdenv.hostPlatform
We are attempting to deprecate these top-level attributes in upstream
Nixpkgs.
See also bc0acdad8c.
This commit is contained in:
committed by
Robert Helgesson
parent
1aaa1a033b
commit
781d25b315
@@ -36,7 +36,7 @@ let
|
||||
in {
|
||||
meta.maintainers = with maintainers; [ midchildan ];
|
||||
|
||||
config = mkIf pkgs.hostPlatform.isLinux {
|
||||
config = mkIf pkgs.stdenv.hostPlatform.isLinux {
|
||||
# For shell sessions.
|
||||
home.sessionVariables = localeVars;
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ in {
|
||||
options = {
|
||||
xdg.mime.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = pkgs.hostPlatform.isLinux;
|
||||
default = pkgs.stdenv.hostPlatform.isLinux;
|
||||
defaultText =
|
||||
literalExpression "true if host platform is Linux, false otherwise";
|
||||
description = ''
|
||||
|
||||
@@ -132,9 +132,9 @@ in {
|
||||
|
||||
# The resulting binary name depends on the arch and os
|
||||
# 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 [
|
||||
{
|
||||
@@ -157,7 +157,7 @@ in {
|
||||
(mkIf (cfg.config != null) {
|
||||
xsession.windowManager.command = xmonadBin;
|
||||
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;
|
||||
onChange = ''
|
||||
# Attempt to restart xmonad if X is running.
|
||||
|
||||
@@ -12,7 +12,7 @@ let
|
||||
fonts = "${fontsEnv}/share/fonts";
|
||||
in {
|
||||
# macOS won't recognize symlinked fonts
|
||||
config = mkIf pkgs.hostPlatform.isDarwin {
|
||||
config = mkIf pkgs.stdenv.hostPlatform.isDarwin {
|
||||
home.activation.copyFonts = hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
copyFonts() {
|
||||
rm -rf ${homeDir}/Library/Fonts/HomeManager || :
|
||||
|
||||
Reference in New Issue
Block a user