Skip to content

packaging: Use correct stdenv for x86_64-darwin #12557

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
roberth merged 1 commit into from
Feb 24, 2025
Merged

packaging: Use correct stdenv for x86_64-darwin #12557

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
1 change: 0 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@
f = import ./packaging/components.nix {
inherit (final) lib;
inherit officialRelease;
inherit stdenv;
pkgs = final;
src = self;
};
Expand Down
10 changes: 9 additions & 1 deletion packaging/components.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
lib,
pkgs,
src,
stdenv,
officialRelease,
}:

Expand All @@ -12,6 +11,15 @@ let
inherit (scope)
callPackage
;
inherit
(scope.callPackage (
{ stdenv }:
{
inherit stdenv;
}
) { })
stdenv
;
Comment on lines +14 to +22
Copy link
Member Author

@roberth roberth Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not pretty. Will consider moving the build utilities to their own file, and then callPackage that.

Copy link
Member Author

@roberth roberth Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either way we aren't making much use of the two layers of scoping, and we could simplify by squashing those into one scope. I'd keep the separate file for dependencies, but wire it up with import and // - should be simple enough.

inherit (pkgs.buildPackages)
meson
ninja
Expand Down
Loading