nix-community/dream2nix
1
1
Fork 0
mirror of https://github.com/nix-community/dream2nix.git synced 2024-12-29 01:14:09 +03:00
Code Issues Projects Releases Wiki Activity

fix: pass dream2nixInterface to modules aswell

Browse Source
This commit is contained in:
Yusuf Bera Ertan 2022-11-18 05:48:21 +03:00
parent 4b9b9f17e9
commit c27dde13ad
No known key found for this signature in database
GPG Key ID: 1D8F8FAF2294D6EA
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/default.nix
View File

@ -81,6 +81,11 @@ in let
;
dream2nixConfigFile = configFile;
dream2nixConfig = config;
dream2nixInterface = {
inherit
makeOutputsForDreamLock
;
};
};
/*
@ -102,11 +107,6 @@ in let
inherit framework;
inherit dream2nixWithExternals;
inherit nix;
dream2nixInterface = {
inherit
makeOutputsForDreamLock
;
};
};
# like pkgs.callPackage, but includes all the dream2nix modules

1
src/lib.nix
View File

@ -103,6 +103,7 @@
pkgs = throw "pkgs is not available before nixpkgs is imported";
externals = throw "externals is not available before nixpkgs is imported";
dream2nixWithExternals = throw "not available before nixpkgs is imported";
dream2nixInterface = throw "not available before nixpkgs is imported";
};
initD2N = initDream2nix config;

4
src/modules/top-level.nix
View File

@ -8,6 +8,7 @@
dream2nixConfig,
dream2nixConfigFile,
dream2nixWithExternals,
dream2nixInterface,
} @ args: let
t = lib.types;
in {
@ -61,6 +62,9 @@ in {
dream2nixConfigFile = lib.mkOption {
type = t.path;
};
dream2nixInterface = lib.mkOption {
type = t.raw;
};
};
config =
args