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

fix: sourceOverrides not applied to path sources

Browse Source
This commit is contained in:
DavHau 2022-02-23 12:15:27 +07:00
parent 59754b406d
commit 3e19b05b9a
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/default.nix
View File

@ -151,6 +151,7 @@ let
dreamLock, dreamLock,
fetcher ? null, fetcher ? null,
extract ? false, extract ? false,
sourceOverrides ? oldSources: {},
}@args: }@args:
let let
# if dream lock is a file, read and parse it # if dream lock is a file, read and parse it
@ -163,6 +164,7 @@ let
args.fetcher; args.fetcher;
fetched = fetcher rec { fetched = fetcher rec {
inherit sourceOverrides;
defaultPackage = dreamLock._generic.defaultPackage; defaultPackage = dreamLock._generic.defaultPackage;
defaultPackageVersion = dreamLock._generic.packages."${defaultPackage}"; defaultPackageVersion = dreamLock._generic.packages."${defaultPackage}";
sources = dreamLock'.sources; sources = dreamLock'.sources;
@ -261,11 +263,6 @@ let
dreamLockInterface = (utils.readDreamLock { inherit dreamLock; }).interface; dreamLockInterface = (utils.readDreamLock { inherit dreamLock; }).interface;
fetchedSources =
lib.recursiveUpdate
args.fetchedSources
(sourceOverrides args.fetchedSources);
produceDerivation = name: pkg: produceDerivation = name: pkg:
utils.applyOverridesToPackage { utils.applyOverridesToPackage {
inherit pkg; inherit pkg;
@ -411,7 +408,7 @@ let
fetcher; fetcher;
fetchedSources = (fetchSources { fetchedSources = (fetchSources {
inherit dreamLock; inherit dreamLock sourceOverrides;
fetcher = fetcher'; fetcher = fetcher';
}).fetchedSources; }).fetchedSources;

10
src/fetchers/default-fetcher.nix
View File

@ -10,6 +10,7 @@
# sources attrset from dream lock # sources attrset from dream lock
defaultPackage, defaultPackage,
defaultPackageVersion, defaultPackageVersion,
sourceOverrides,
sources, sources,
... ...
}: }:
@ -31,7 +32,7 @@ let
source.path source.path
# assume path relative to main package source # assume path relative to main package source
else else
"${fetchedSources."${defaultPackage}"."${defaultPackageVersion}"}/${source.path}" "${overriddenSources."${defaultPackage}"."${defaultPackageVersion}"}/${source.path}"
else if fetchers.fetchers ? "${source.type}" then else if fetchers.fetchers ? "${source.type}" then
fetchSource { fetchSource {
source = source // { source = source // {
@ -43,8 +44,13 @@ let
versions) versions)
sources; sources;
overriddenSources =
lib.recursiveUpdate
fetchedSources
(sourceOverrides fetchedSources);
in in
{ {
# attrset: pname -> path of downloaded source # attrset: pname -> path of downloaded source
inherit fetchedSources; fetchedSources = overriddenSources;
} }