From e69dd36cc33398b96bec2b4fd8893682171eddef Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 25 Mar 2024 17:11:17 +0800 Subject: [PATCH] packages: fix build for aarch64 --- modules/packages/desktop/default.nix | 2 ++ modules/packages/server/default.nix | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/packages/desktop/default.nix b/modules/packages/desktop/default.nix index 5ac1276e..387c8c3a 100644 --- a/modules/packages/desktop/default.nix +++ b/modules/packages/desktop/default.nix @@ -34,6 +34,8 @@ inputs: localPackages.slate utterly-nord-plasma # terminal unstablePackages.warp-terminal + # development + adb-sync ]; }; programs = diff --git a/modules/packages/server/default.nix b/modules/packages/server/default.nix index acbe4665..cbe59c51 100644 --- a/modules/packages/server/default.nix +++ b/modules/packages/server/default.nix @@ -30,9 +30,9 @@ inputs: # file manager tree eza trash-cli lsd broot file xdg-ninja mlocate # compress - pigz rar upx unzip zip lzip p7zip + pigz upx unzip zip lzip p7zip # file system management - sshfs e2fsprogs adb-sync duperemove compsize exfatprogs + sshfs e2fsprogs duperemove compsize exfatprogs # disk management smartmontools hdparm # encryption and authentication @@ -46,7 +46,8 @@ inputs: # development gdb try inputs.topInputs.plasma-manager.packages.${inputs.pkgs.system}.rc2nix hexo-cli gh ] - ++ (with inputs.config.boot.kernelPackages; [ cpupower usbip ]); + ++ (with inputs.config.boot.kernelPackages; [ cpupower usbip ]) + ++ (inputs.lib.optional (inputs.config.nixos.system.nixpkgs.arch == "x86_64") rar); _pythonPackages = [(pythonPackages: with pythonPackages; [ openai python-telegram-bot fastapi pypdf2 pandas matplotlib plotly gunicorn redis jinja2