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

Misc static cross fixes #91975

Merged
merged 2 commits into from Jul 26, 2020
Merged

Misc static cross fixes #91975

merged 2 commits into from Jul 26, 2020

Conversation

@symphorien
Copy link
Contributor

symphorien commented Jul 1, 2020

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)

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@@ -276,4 +280,28 @@ in {
libev = super.libev.override { static = true; };

libexecinfo = super.libexecinfo.override { enableShared = false; };

xorg = super.xorg.overrideScope' (xorgself: xorgsuper: {

This comment has been minimized.

@FRidh

FRidh Jul 2, 2020 Member

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.

This comment has been minimized.

@symphorien

symphorien Jul 2, 2020 Author Contributor

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.

This comment has been minimized.

@FRidh

FRidh Jul 2, 2020 Member

It's possible with something like

libXxf86dga = lib.makeOverrideable ({enableStatic, ... } @attrs: super.libXxf86dga.overrideAttrs(oldAttrs: {
} // attrs));

but yea, not really worth it.

@FRidh FRidh added this to WIP in Staging via automation Jul 2, 2020
@FRidh FRidh moved this from WIP to Needs review in Staging Jul 2, 2020
@vcunat vcunat changed the base branch from master to staging Jul 26, 2020
Staging automation moved this from Needs review to Ready Jul 26, 2020
@vcunat
vcunat approved these changes Jul 26, 2020
Copy link
Member

vcunat left a comment

Seems OK.

I expect the rebuilds are mainly because of libjpeg(-turbo).

@vcunat vcunat merged commit 5bd8316 into NixOS:staging Jul 26, 2020
15 of 16 checks passed
15 of 16 checks passed
grahamcofborg-eval Checking original out paths
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80ba806"; rev="80ba806339c78bda689c75b1156e56470eb146d2"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80ba806"; rev="80ba806339c78bda689c75b1156e56470eb146d2"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80ba806"; rev="80ba806339c78bda689c75b1156e56470eb146d2"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80ba806"; rev="80ba806339c78bda689c75b1156e56470eb146d2"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80ba806"; rev="80ba806339c78bda689c75b1156e56470eb146d2"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80ba806"; rev="80ba806339c78bda689c75b1156e56470eb146d2"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="80ba806"; rev="80ba806339c78bda689c75b1156e56470eb146d2"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
libjpeg_turbo, libjpeg_turbo.passthru.tests on aarch64-linux Success
Details
libjpeg_turbo, libjpeg_turbo.passthru.tests on x86_64-linux Success
Details
Staging automation moved this from Ready to Done Jul 26, 2020
@ofborg ofborg bot requested a review from vcunat Jul 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.