From e10fd4b3193a240b1d84cc4cf1e0d55007343c21 Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Sat, 27 Mar 2021 09:21:27 -0700 Subject: [PATCH] shell: get extern and overrides to pass to mkpkgs --- flake.nix | 2 +- shell/default.nix | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index a4c648c4..83fd1ba8 100644 --- a/flake.nix +++ b/flake.nix @@ -89,7 +89,7 @@ (os.mkPackages { inherit pkgs; }); devShell = import ./shell { - inherit self system; + inherit self system extern overrides; }; } ); diff --git a/shell/default.nix b/shell/default.nix index 72ac09e4..0b132f99 100644 --- a/shell/default.nix +++ b/shell/default.nix @@ -1,8 +1,12 @@ { self ? (import ../compat).defaultNix , system ? builtins.currentSystem +, extern ? import ../extern { inherit (self) inputs; } +, overrides ? import ../overrides }: let - pkgs = (self.lib.os.mkPkgs).${system}; + pkgs = (self.lib.os.mkPkgs { + inherit overrides extern; + }).${system}; inherit (pkgs) lib;