max/config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pass inputs to packages.nix

Browse source
This commit is contained in:
Max Headroom 2022-03-17 20:02:48 +01:00
parent 69db138349
commit 5a9812bff6
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

@ -84,8 +84,7 @@
}; };
packages.${system} = import ./packages { packages.${system} = import ./packages {
nixpkgs = pkgs; inherit inputs pkgs;
inherit inputs;
}; };
defaultApp.${system} = { defaultApp.${system} = {

6
packages/default.nix
View file

@ -1,8 +1,8 @@
{ nixpkgs, inputs }: { pkgs, inputs }@args:
let let
patched-derivations = import ./patched-derivations.nix nixpkgs; patched-derivations = import ./patched-derivations.nix pkgs;
patched-inputs = import ./patched-inputs.nix inputs; patched-inputs = import ./patched-inputs.nix inputs;
packages = import ./packages.nix nixpkgs; packages = import ./packages.nix args;
in patched-derivations in patched-derivations
// patched-inputs // patched-inputs
// packages // packages

2
packages/packages.nix
View file

@ -1,4 +1,4 @@
pkgs: { { inputs, pkgs }: {
privatevoid-smart-card-ca-bundle = pkgs.callPackage ./data/privatevoid-smart-card-certificate-authority-bundle.nix { }; privatevoid-smart-card-ca-bundle = pkgs.callPackage ./data/privatevoid-smart-card-certificate-authority-bundle.nix { };
jdtls = pkgs.callPackage ./development/langservers/jdtls.nix { }; jdtls = pkgs.callPackage ./development/langservers/jdtls.nix { };