Misc static cross fixes #91975
Merged
Misc static cross fixes #91975
Conversation
This file contains 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
symphorien
force-pushed
the
misc-static-fixes2
branch
from
4a8b035
to
80ba806
Compare
FRidh
reviewed
Jul 2, 2020
| @@ -276,4 +280,28 @@ in { | |||
| libev = super.libev.override { static = true; }; | |||
|
|
|||
| libexecinfo = super.libexecinfo.override { enableShared = false; }; | |||
|
|
|||
| xorg = super.xorg.overrideScope' (xorgself: xorgsuper: { | |||
There was a problem hiding this comment.
I think it would be preferably to introduce some kind of enableStatic option in the xorg derivations, if possible, but I guess that is difficult because they are "generated" and then overridden.
There was a problem hiding this comment.
I don't think we can change the signature of a function while overriding...
In any case I'd rather see something like #83664 implemented.
There was a problem hiding this comment.
It's possible with something like
libXxf86dga = lib.makeOverrideable ({enableStatic, ... } @attrs: super.libXxf86dga.overrideAttrs(oldAttrs: {
} // attrs));
but yea, not really worth it.
vcunat
approved these changes
Jul 26, 2020
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.
Motivation for this change
cross compile x11vnc to i686 linux musl static
Things done
Tested on top of #89471
Tested that x11vnc still compile on x86_64-linux
Tested that a slightly modified x11vnc cross compiles to x86_64 musl static and i686 musl static
(I removed systemd and libgcrypt optional dependencies from libvncserver)
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)