Skip to content

patchpkg: patch missing Python refs on darwin #2258

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
merged 2 commits into from
Sep 10, 2024
Merged

patchpkg: patch missing Python refs on darwin #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
828339e
patchpkg: patch missing Python refs on darwin
gcurtis Sep 9, 2024
73a524e
Remove outdated comment
gcurtis Sep 10, 2024
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
4 changes: 1 addition & 3 deletions internal/devpkg/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,7 @@ func patchGlibcFunc(canonicalName string, mode configfile.PatchMode) func() bool
case configfile.PatchNever:
patch = false
}

// Check nix.SystemIsLinux() last because it's slow.
return patch && nix.SystemIsLinux()
return patch
Copy link
Collaborator

Choose a reason for hiding this comment

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

need to update comment

})
}

Expand Down
2 changes: 1 addition & 1 deletion internal/patchpkg/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func (d *DerivationBuilder) needsGlibcPatch(file *bufio.Reader, filePath string)

func (d *DerivationBuilder) findRemovedRefs(ctx context.Context, pkg *packageFS) ([]fileSlice, error) {
var refs []fileSlice
matches, err := fs.Glob(pkg, "lib/python*/_sysconfigdata__linux*.py")
matches, err := fs.Glob(pkg, "lib/python*/_sysconfigdata_*.py")
if err != nil {
return nil, err
}
Expand Down
9 changes: 7 additions & 2 deletions internal/shellgen/tmpl/glibc-patch.nix.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
builtins.map (drv: drv.outPath) mkTree;

# Programs needed by glibc-patch.bash.
inherit (nixpkgs-glibc.legacyPackages."${system}") bash coreutils glibc gnused patchelf ripgrep;
inherit (nixpkgs-glibc.legacyPackages."${system}") bash coreutils gnused patchelf ripgrep;

isLinux = (builtins.match ".*linux.*" system) != null;
glibc = if isLinux then nixpkgs-glibc.legacyPackages."${system}".glibc else null;

# Create a package that puts the local devbox binary in the conventional
# bin subdirectory. This also ensures that the executable is named
Expand All @@ -92,7 +95,9 @@

DEVBOX_DEBUG = 1;
builder = "${devbox}/bin/devbox";
args = [ "patch" "--restore-refs" "--glibc" glibc pkg ];
args = [ "patch" "--restore-refs" ] ++
(if glibc != null then [ "--glibc" "${glibc}" ] else [ ]) ++
[ pkg ];
};
in
{
Expand Down
Loading