From 6cbabf2eba5c8aa9db40476228af1a4ec1234740 Mon Sep 17 00:00:00 2001 From: xieby1 Date: Thu, 23 Nov 2023 09:23:38 +0800 Subject: [PATCH] usr: gui: disable x86_64-linux package on aarch64-linux --- config.nix | 3 ++- usr/gui.nix | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/config.nix b/config.nix index 3803e866..051bf4af 100644 --- a/config.nix +++ b/config.nix @@ -1,6 +1,7 @@ # see pkgs/top-level/config.nix { - allowUnsupportedSystem = true; + # disable install non-native packages, like install x86_64-linux packages on aarch64-linux + allowUnsupportedSystem = false; allowUnfree = true; packageOverrides = pkgs: { nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { diff --git a/usr/gui.nix b/usr/gui.nix index 5c8e00bd..21044be0 100644 --- a/usr/gui.nix +++ b/usr/gui.nix @@ -54,15 +54,19 @@ in home.packages = with pkgs; [ libnotify # browser + ] ++ pkgs.lib.optionals (builtins.currentSystem=="x86_64-linux") [ google-chrome + ] ++ [ firefox # network mykdeconnect + ] ++ pkgs.lib.optionals (builtins.currentSystem=="x86_64-linux") [ feishu nur.repos.xddxdd.wechat-uos # wine weixin waste too much memory, more than 4GB!!! #(import ./gui/weixin.nix {}) nur.repos.linyinfeng.wemeet + ] ++ [ transmission-gtk tdesktop # text @@ -78,22 +82,24 @@ in gimp # viewer myxdot + ] ++ pkgs.lib.optionals (builtins.currentSystem=="x86_64-linux") [ my-imhex xelfviewer + ] ++ [ vlc # my-xournalpp # pdf annotation xournalpp + ] ++ pkgs.lib.optionals (builtins.currentSystem=="x86_64-linux") [ ghidra + ] ++ [ # management zotero barrier # entertainment antimicrox # music + ] ++ pkgs.lib.optionals (builtins.currentSystem=="x86_64-linux") [ spotify - # runXonY - wineWowPackages.stable - winetricks ]; xdg.mime.types = {