mimalloc: Fixes and portability improvements #380289
Open
+28
−10
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kirillrdy
reviewed
Feb 8, 2025
Co-authored-by: kirillrdy <kirillrdy@gmail.com>
thoughtpolice
approved these changes
Feb 8, 2025
|
illdefined
suggested changes
Feb 15, 2025
| ++ lib.optionals (!doCheck) [ "-DMI_BUILD_TESTS=OFF" ]; | ||
| cmakeFlags = [ | ||
| (lib.cmakeBool "MI_INSTALL_TOPLEVEL" true) | ||
| (lib.cmakeBool "DMI_SECURE" secureBuild) |
There was a problem hiding this comment.
Suggested change
| (lib.cmakeBool "DMI_SECURE" secureBuild) | |
| (lib.cmakeBool "MI_SECURE" secureBuild) |
illdefined
reviewed
Feb 15, 2025
Comment on lines
+38
to
+51
| cmakeFlags = [ | ||
| (lib.cmakeBool "MI_INSTALL_TOPLEVEL" true) | ||
| (lib.cmakeBool "DMI_SECURE" secureBuild) | ||
| (lib.cmakeBool "MI_BUILD_SHARED" ( | ||
| !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries | ||
| )) | ||
| (lib.cmakeBool "MI_LIBC_MUSL" (stdenv.hostPlatform.libc == "musl")) | ||
| (lib.cmakeBool "MI_LOCAL_DYNAMIC_TLS" localDynamicTLS) | ||
| (lib.cmakeBool "MI_BUILD_TESTS" finalAttrs.doCheck) | ||
|
|
||
| # MI_OPT_ARCH is inaccurate (e.g. it assumes aarch64 == armv8.1-a). | ||
| # Nixpkgs's native platform configuration does a better job. | ||
| (lib.cmakeBool "MI_OPT_ARCH" false) | ||
| ]; |
There was a problem hiding this comment.
Just an idea that I think might improve readability:
Suggested change
| cmakeFlags = [ | |
| (lib.cmakeBool "MI_INSTALL_TOPLEVEL" true) | |
| (lib.cmakeBool "DMI_SECURE" secureBuild) | |
| (lib.cmakeBool "MI_BUILD_SHARED" ( | |
| !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries | |
| )) | |
| (lib.cmakeBool "MI_LIBC_MUSL" (stdenv.hostPlatform.libc == "musl")) | |
| (lib.cmakeBool "MI_LOCAL_DYNAMIC_TLS" localDynamicTLS) | |
| (lib.cmakeBool "MI_BUILD_TESTS" finalAttrs.doCheck) | |
| # MI_OPT_ARCH is inaccurate (e.g. it assumes aarch64 == armv8.1-a). | |
| # Nixpkgs's native platform configuration does a better job. | |
| (lib.cmakeBool "MI_OPT_ARCH" false) | |
| ]; | |
| cmakeFlags = lib.mapAttrsToList lib.cmakeBool { | |
| MI_INSTALL_TOPLEVEL = true; | |
| MI_SECURE = secureBuild; | |
| MI_BUILD_SHARED = !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries; | |
| MI_LIBC_MUSL = stdenv.hostPlatform.libc == "musl"; | |
| MI_LOCAL_DYNAMIC_TLS = localDynamicTLS; | |
| MI_BUILD_TESTS = finalAttrs.doCheck; | |
| # MI_OPT_ARCH is inaccurate (e.g. it assumes aarch64 == armv8.1-a). | |
| # Nixpkgs's native platform configuration does a better job. | |
| MI_OPT_ARCH = false; | |
| }; |
This was referenced Jun 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Things done
This PR adds a few fixes and portability improvements to the mimalloc derivation.
finalAttrspattern to allow updatingversionanddoCheckmore effectivelyMI_LIBC_MUSLfor musl compatibilityMI_LOCAL_DYNAMIC_TLS, which is useful in some cases for shared librariesMI_OPT_ARCH, which is less accurate than Nixpkgs's own platform build flag systemMIMALLOC_LIBRARY_DIRandMIMALLOC_OBJECT_DIRvariables, which are naively based on CMake file locations and reference the wrong output pathnix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.