Propagate system in preparation for flakization.

Author: VojtechStep

.nix/fallback-config.nix

@@ -1,4 +1,4 @@
-with (import (import ./nixpkgs.nix) {}).lib;
+with import "${import ./nixpkgs.nix}/lib";
 {
   ## DO NOT CHANGE THIS
   format = "1.0.0";

config-parser-1.0.0/default.nix

@@ -14,10 +14,11 @@ with builtins;
   ocaml-override ? {},
   global-override ? {},
   lib,
+  system
 }@initial:
 with lib;
 let config = import ./normalize.nix
-  { inherit (initial) src lib config nixpkgs; };
+  { inherit (initial) src lib config nixpkgs system; };
 in with config; let
 
   bundle-ppaths = bundle:
@@ -66,7 +67,7 @@ in with config; let
       { inherit lib overlays-dir rocq-overlays-dir coq-overlays-dir ocaml-overlays-dir bundle;
         inherit (config) attribute coq-attribute no-rocq-yet pname shell-attribute shell-pname src; };
 
-    pkgs = import config.nixpkgs { inherit overlays; };
+    pkgs = import config.nixpkgs { inherit overlays system; };
 
     ci = import ./ci.nix { inherit lib this-shell-pkg pkgs bundle; };
 

config-parser-1.0.0/normalize.nix

@@ -1,6 +1,6 @@
 # This file is a toolbox file to parse a ./nix/config.nix
 # file in format 1.0.0
-{lib, config, nixpkgs, src}@initial:
+{lib, config, nixpkgs, src, system}@initial:
 with builtins; with lib;
 let
   normalize-coqpkg = name: pkg: let j = pkg.job or name; in

default.nix

@@ -29,7 +29,8 @@ in
   update-nixpkgs ? false,
   job ? null,
   bundle ? null,
-  inNixShell ? null
+  inNixShell ? null,
+  system ? builtins.currentSystem
 }@args:
 let
   optionalImport = f: d:
@@ -40,7 +41,8 @@ let
     config = (optionalImport config-file (optionalImport fallback-file {}))
               // config;
     nixpkgs = optionalImport nixpkgs-file (throw "cannot find nixpkgs");
-    pkgs = import initial.nixpkgs {};
+    inherit system;
+    pkgs = import initial.nixpkgs { inherit system; };
     src = src;
     lib = (initial.pkgs.coqPackages.lib or tmp-pkgs.lib)
           // { diag = f: x: f x x; };