diff --git a/flake.nix b/flake.nix index 1f57a40..6037fd1 100644 --- a/flake.nix +++ b/flake.nix @@ -84,8 +84,7 @@ }; packages.${system} = import ./packages { - nixpkgs = pkgs; - inherit inputs; + inherit inputs pkgs; }; defaultApp.${system} = { diff --git a/packages/default.nix b/packages/default.nix index e0f6375..22189ee 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,8 +1,8 @@ -{ nixpkgs, inputs }: +{ pkgs, inputs }@args: let - patched-derivations = import ./patched-derivations.nix nixpkgs; + patched-derivations = import ./patched-derivations.nix pkgs; patched-inputs = import ./patched-inputs.nix inputs; - packages = import ./packages.nix nixpkgs; + packages = import ./packages.nix args; in patched-derivations // patched-inputs // packages diff --git a/packages/packages.nix b/packages/packages.nix index 304aece..574b045 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -1,4 +1,4 @@ -pkgs: { +{ inputs, pkgs }: { privatevoid-smart-card-ca-bundle = pkgs.callPackage ./data/privatevoid-smart-card-certificate-authority-bundle.nix { }; jdtls = pkgs.callPackage ./development/langservers/jdtls.nix { };