nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-09 03:56:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify return value of modules/default.nix

Browse source
This commit is contained in:
Tobias Happ 2019-11-26 15:24:29 +01:00 • committed by Alexander Sosedkin
parent 5546564104
commit 41e39deaec
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/default.nix
View file

@ -31,9 +31,7 @@ let
else showWarnings rawModule.config.warnings rawModule; else showWarnings rawModule.config.warnings rawModule;
in in
if initialBuild {
then module.config
else {
inherit (module.config.build) activationPackage; inherit (module.config.build) activationPackage;
inherit (module.config.environment) path; inherit (module) config;
} }

7
pkgs/default.nix
View file

@ -8,7 +8,7 @@ let
nixpkgs = loadNixpkgs { }; nixpkgs = loadNixpkgs { };
config = import ../modules { modules = import ../modules {
pkgs = nixpkgs; pkgs = nixpkgs;
initialBuild = true; initialBuild = true;
@ -29,7 +29,10 @@ let
}; };
callPackage = nixpkgs.lib.callPackageWith ( callPackage = nixpkgs.lib.callPackageWith (
nixpkgs // customPkgs // { inherit callPackage config; } nixpkgs // customPkgs // {
inherit (modules) config;
inherit callPackage;
}
); );
customPkgs = rec { customPkgs = rec {