Stop importing nixpkgs in the flake

This commit is contained in:
eriedaberrie 2024-04-16 09:53:53 -07:00
parent e8476369b7
commit eefaac81dc
2 changed files with 11 additions and 13 deletions

View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701718080, "lastModified": 1712963716,
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -8,16 +8,14 @@
nixpkgs, nixpkgs,
}: let }: let
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
genSystems = lib.genAttrs [ forSystems = f:
"x86_64-linux" lib.genAttrs [
"aarch64-linux" "x86_64-linux"
]; "aarch64-linux"
pkgsFor = system: import nixpkgs {inherit system;}; ] (system: f nixpkgs.legacyPackages.${system});
in { in {
devShells = genSystems ( devShells = forSystems (
system: let pkgs: {
pkgs = pkgsFor system;
in {
default = pkgs.mkShell { default = pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.clang-tools pkgs.clang-tools
@ -46,6 +44,6 @@
} }
); );
formatter = genSystems (system: (pkgsFor system).alejandra); formatter = forSystems (pkgs: pkgs.alejandra);
}; };
} }