Skip to content

fix: apply logos-nix's fetchCargoVendor User-Agent overlay in mkPkgsWith #220

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

Open
danisharora099 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: apply logos-nix's fetchCargoVendor User-Agent overlay in mkPkgsWith #220

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
12 changes: 11 additions & 1 deletion lib/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,19 @@ let
# x86_64-windows cannot be produced by `import nixpkgs { system = ...; }` --
# it needs localSystem/crossSystem plus logos-nix's mingw overlays, which is
# exactly what logos-nix.lib.mkWindowsPkgs wraps.
#
# Native sets carry logos-nix's fetchCargoVendor User-Agent overlay (crates.io
# 403s the pin's UA-less helper: logos-module-builder#159, logos-nix#6).
# Optional-guarded so a logos-nix pin predating the attribute still evaluates.
mkPkgsWith = extraOverlays: system:
if system != "x86_64-windows" then
import nixpkgs { inherit system; overlays = extraOverlays; }
import nixpkgs {
inherit system;
overlays =
lib.optional (logos-nix != null && logos-nix ? lib.overlays.fetchCargoVendorUserAgent)
logos-nix.lib.overlays.fetchCargoVendorUserAgent
++ 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