From dc0ac2a333bea81301f49ac86a3a5fefc224e87e Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 27 Feb 2024 12:21:44 +0800 Subject: [PATCH] localPackages.vasp: use system-features to limit build --- local/pkgs/vasp/nvidia/default.nix | 1 + modules/system/nix.nix | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/local/pkgs/vasp/nvidia/default.nix b/local/pkgs/vasp/nvidia/default.nix index 1303cebe..e5645de0 100644 --- a/local/pkgs/vasp/nvidia/default.nix +++ b/local/pkgs/vasp/nvidia/default.nix @@ -54,6 +54,7 @@ let mkdir -p $out/bin for i in std gam ncl; do cp bin/vasp_$i $out/bin/vasp-$i; done ''; + requiredSystemFeatures = [ "nvhpcarch-${nvhpcArch}" ]; }; startScript = version: writeScript "vasp-nvidia-${version}" '' diff --git a/modules/system/nix.nix b/modules/system/nix.nix index 3b4cf9d1..046ad81c 100644 --- a/modules/system/nix.nix +++ b/modules/system/nix.nix @@ -57,13 +57,15 @@ inputs: } # marches { - nix.settings.system-features = map + nix.settings.system-features = + (map (march: "gccarch-${march}") ( if nix.marches == null then (with inputs.config.nixos.system.nixpkgs; if march == null then [] else [ march ]) else nix.marches - ); + )) + ++ (with inputs.config.nixos.system.nixpkgs; if march == null then [] else [ "nvhpcArch-${march}" ]); } # includeBuildDependencies {