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.
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
treewide: cross-fixes (memcached, opendkim, gdb, tcl, xorg*) #51893
Conversation
64-bit support is only enabled on 64-bit systems
lib/systems/default.nix
Outdated
@@ -98,7 +98,7 @@ rec { | |||
in | |||
if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name && | |||
(final.parsed.cpu.name == pkgs.stdenv.hostPlatform.parsed.cpu.name || | |||
(final.platform.isi686 && pkgs.stdenv.hostPlatform.isx86_64)) | |||
((final.platform.isi686 or false) && (pkgs.stdenv.hostPlatform.isx86_64 or false))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah that should just be final.isi686
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, because we want to eventually support WSL, we may want to not do this at all. WSL runs on x86-64 but will not run i686 binaries (microsoft/WSL#2468).
@@ -251,6 +252,8 @@ self: super: | |||
|
|||
libXvMC = super.libXvMC.overrideAttrs (attrs: { | |||
outputs = [ "out" "dev" "doc" ]; | |||
configureFlags = attrs.configureFlags or [] | |||
++ malloc0ReturnsNullCrossFlag; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@globin I assume your stuff covers this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only had tested the build of a part of xorg.*
, this is most probably just fine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. The xserver fixes are already included.
|
Motivation for this change
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)