Skip to content
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

Merged
merged 13 commits into from Dec 16, 2018

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Dec 12, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@@ -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)))
Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member

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

Copy link
Member

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;
Copy link
Member

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?

Copy link
Member

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.

Copy link
Member Author

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.

@Mic92
Copy link
Member Author

Mic92 commented Dec 13, 2018

@GrahamcOfBorg build memcached tcl libmilter tdb opendkim gdb valgrind xorg.libXvMC xorg.libXt xorg.libXinerama

@Mic92 Mic92 merged commit ba5cba0 into NixOS:staging Dec 16, 2018
@Mic92 Mic92 deleted the cross-fixes-2 branch December 16, 2018 01:28
@Mic92 Mic92 mentioned this pull request Jan 4, 2019
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants