nix/common.nix: use pattern from nix-community/flake-compat

This is still a bit confusing, as normally the flake.defaultNix attrset
gets exposed via a top-level default.nix, but at least it brings us
closer to that.
This commit is contained in:
Florian Klink 2023-07-16 12:47:04 +03:00
parent 1bbf604224
commit 79ca8e76a4

View file

@ -1,14 +1,17 @@
let let
lock = builtins.fromJSON (builtins.readFile ../flake.lock); lock = builtins.fromJSON (builtins.readFile ../flake.lock);
flakeCompatRev = lock.nodes.flake-compat.locked.rev;
flakeCompat = fetchTarball { inherit (lock.nodes.flake-compat.locked) owner repo rev narHash;
url =
"https://github.com/edolstra/flake-compat/archive/${flakeCompatRev}.tar.gz"; flake-compat = fetchTarball {
sha256 = lock.nodes.flake-compat.locked.narHash; url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
sha256 = narHash;
}; };
flake = ((import flakeCompat) { src = ../.; }).defaultNix;
in rec { flake = (import flake-compat { system = builtins.currentSystem; src = ../.; });
pkgsSrc = flake.inputs.nixpkgs; in
cargo2nix = flake.inputs.cargo2nix; rec {
pkgsSrc = flake.defaultNix.inputs.nixpkgs;
cargo2nix = flake.defaultNix.inputs.cargo2nix;
cargo2nixOverlay = cargo2nix.overlays.default; cargo2nixOverlay = cargo2nix.overlays.default;
} }