Skip to content

Commit 00f62db

Browse files
committed
don't take a system argument in default.nix
Just one `system` is insufficient for cross compilation, although I'm not sure cross compilation is a concern for fenix. Either way, nixpkgs' default behavior is good enough, and if callers need to do special things about systems, they can do so by providing an instance of nixpkgs configured the way they need it to be.
1 parent e0d44b7 commit 00f62db

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Diff for: default.nix

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
let
22
inherit (builtins)
3-
currentSystem elemAt filter fromJSON mapAttrs match readFile substring;
3+
elemAt filter fromJSON mapAttrs match readFile substring;
44

55
getFlake = name:
66
with (fromJSON (readFile ./flake.lock)).nodes.${name}.locked; {
@@ -12,8 +12,7 @@ let
1212
};
1313
in
1414

15-
{ system ? currentSystem
16-
, pkgs ? import (getFlake "nixpkgs") { localSystem = { inherit system; }; }
15+
{ pkgs ? import (getFlake "nixpkgs") { }
1716
, lib ? pkgs.lib
1817
, rust-analyzer-src ? getFlake "rust-analyzer-src"
1918
, rust-analyzer-rev ? substring 0 7 (rust-analyzer-src.rev or "0000000")

0 commit comments

Comments
 (0)