diff --git a/ci-root.nix b/ci-root.nix index 4003999ca9..0fd3e096cd 100644 --- a/ci-root.nix +++ b/ci-root.nix @@ -2,8 +2,9 @@ # # SPDX-License-Identifier: Apache-2.0 +{ system ? builtins.currentSystem, ... }: let - depot = (import ./default.nix {}); + depot = (import ./default.nix { inherit system; }); pkgs = depot.third_party.nixpkgs; lib = pkgs.lib; prefixAttrs = prefix: lib.mapAttrsToList (name: value: { name = "${prefix}-${name}"; path = value; }); diff --git a/default.nix b/default.nix index 608cd1f314..c9468c535f 100644 --- a/default.nix +++ b/default.nix @@ -2,12 +2,12 @@ # # SPDX-License-Identifier: Apache-2.0 -{ ... }: +{ system ? builtins.currentSystem, ... }: let fix = f: let x = f x; in x; config = depot: { - inherit depot; + inherit depot system; pkgs = depot.third_party.nixpkgs; }; in fix (self: diff --git a/third_party/default.nix b/third_party/default.nix index 93b93e5f76..d7923c0f76 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -{ depot, ... }@ch: +{ depot, system, ... }@ch: let nixpkgsConfig = { allowUnfree = true; @@ -15,6 +15,7 @@ let }; }; nixpkgs = import ./nixpkgs { + inherit system; config = nixpkgsConfig; }; crate2nixSrc = nixpkgs.fetchFromGitHub {