Skip to content

fix(nix): apply logos-nix's native overlays in mkPkgsWith #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlipicar merged 1 commit into from
Sep 8, 2026
+16 −4
Merged

fix(nix): apply logos-nix's native overlays in mkPkgsWith #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion lib/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,18 @@ let
systems = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]
++ lib.optional (logos-nix != null) "x86_64-windows";

# Native sets carry logos-nix's own overlays -- today the two crates.io 403
# fixes, which are what makes a Rust module's crates fetchable at all. Taking
# the LIST rather than naming entries is deliberate: naming them is how the
# importCargoLock fix shipped reaching nothing.
nativeOverlays =
if logos-nix == null then [ ]
else if logos-nix ? lib.nativeOverlays then logos-nix.lib.nativeOverlays
else throw ("logos-module-builder: the pinned logos-nix predates "
+ "lib.nativeOverlays, so Rust modules would vendor crates from "
+ "an endpoint crates.io 403s. Bump the logos-nix input past "
+ "logos-co/logos-nix#11.");

# THE package-set constructor. Every module's pkgs comes from here, which is
# what lets ~40 modules target Windows without each re-deriving the cross
# plumbing.
Expand All @@ -98,7 +110,7 @@ let
# exactly what logos-nix.lib.mkWindowsPkgs wraps.
mkPkgsWith = extraOverlays: system:
if system != "x86_64-windows" then
import nixpkgs { inherit system; overlays = extraOverlays; }
import nixpkgs { inherit system; overlays = nativeOverlays ++ extraOverlays; }
else if logos-nix == null then
throw ("logos-module-builder: targeting x86_64-windows requires the "
+ "logos-nix input to be threaded into the builder lib.")
Expand Down
Loading