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

Jump to bottom

amoeba: fix build #104416

Merged
merged 1 commit into from Nov 23, 2020
Merged

amoeba: fix build #104416

merged 1 commit into from Nov 23, 2020

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Nov 20, 2020 •
edited

Motivation for this change

fixes

  In file included from ./main/piprecalc.h:5,
                   from ./main/mainloop.h:12,
                   from main/mainloop.cpp:17:
  ./opengl/glwindow.h:10:10: fatal error: X11/extensions/xf86vmode.h: No such file or directory
     10 | #include <X11/extensions/xf86vmode.h>
        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
  compilation terminated.
  make: *** [<builtin>: main/mainloop.o] Error 1
Things done
  • 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.

@jonringer jonringer requested a review from avnik November 20, 2020 20:39
@avnik
Copy link
Contributor

avnik commented Nov 22, 2020

Fix itself looks good, but you need fix evaluation

@jonringer
Copy link
Contributor Author

I ran ofborg locally, no errors

[06:54:25] jon@nixos ~/projects/nixpkgs (fix-amoeba)
$ GC_INITIAL_HEAP_SIZE=16g nix-env -f ./outpaths.nix -qaP --no-name --out-path --arg checkMeta true --show-trace > out-paths
[06:57:50] jon@nixos ~/projects/nixpkgs (fix-amoeba)

@jonringer jonringer merged commit 97178a0 into NixOS:master Nov 23, 2020
@jonringer jonringer deleted the fix-amoeba branch November 23, 2020 15:01
@jonringer jonringer restored the fix-amoeba branch November 23, 2020 16:55
@jonringer jonringer deleted the fix-amoeba branch November 23, 2020 17:59
@jonringer jonringer mentioned this pull request Nov 23, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@avnik avnik Awaiting requested review from avnik

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jonringer @avnik