Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set gcc.arch, extra-platforms, system-features #1507

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Oct 12, 2024

?

diff --git a/nixos/modules/config/nix.nix b/nixos/modules/config/nix.nix
index 9505c60d4f63..7b437f6f88f0 100644
--- a/nixos/modules/config/nix.nix
+++ b/nixos/modules/config/nix.nix
@@ -379,10 +379,10 @@ in
       substituters = mkAfter [ "https://cache.nixos.org/" ];
       system-features = mkDefault (
         [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
-        optionals (pkgs.stdenv.hostPlatform ? gcc.arch) (
+        optionals (config.nixpkgs.hostPlatform ? gcc.arch) (
           # a builder can run code for `gcc.arch` and inferior architectures
-          [ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ] ++
-          map (x: "gccarch-${x}") (systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or [])
+          [ "gccarch-${config.nixpkgs.hostPlatform.gcc.arch}" ] ++
+          map (x: "gccarch-${x}") (systems.architectures.inferiors.${config.nixpkgs.hostPlatform.gcc.arch} or [])
         )
       );
     };

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant