Skip to content

zathura: disable tests if cross#224903

Merged
1 commit merged intomasterfrom
unknown repository
Apr 24, 2023
Merged

zathura: disable tests if cross#224903
1 commit merged intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Apr 5, 2023

The only part of zathura that won't cross compile is the documentation and tests. Also, the dependency for synctex support (texlive) doesn't cross compile.

@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Apr 6, 2023
@ghost ghost changed the title zathura: disable manpages, docs, and tests if cross zathura: disable manpages, synctex, docs, and tests if cross Apr 6, 2023
@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 6, 2023

@ofborg build pkgsCross.aarch64-multiplatform.zathura

@ghost ghost requested a review from apfelkuchen6 April 6, 2023 02:23
@apfelkuchen6
Copy link
Copy Markdown
Contributor

apfelkuchen6 commented Apr 6, 2023

Since this changes nothing for native builds, but at least builds for aarch64 on x86-64 (tested with #224901), I'm not opposed to merging this, but I'd strongly prefer fixing the stuff that does not work over disabling it:

  • the manpages build when we use buildPackages.python3Packages.sphinx instead of python3.pkgs.sphinx and move check to buildInputs.
  • synctex support works when texlive.bin cross-compiles, so I'd love to get texlive.bin.core{,-big}: fix cross compilation #223303 in instead (yes, I know that this is terrible to review)

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Apr 6, 2023
@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 6, 2023

  • the manpages build when we use buildPackages.python3Packages.sphinx instead of python3.pkgs.sphinx and move check to buildInputs.

Done: 20860bf1129d1290de20bf378968720ce1105fb1

Note: it's easier to keep track of requests like this if you leave them as resolvable review comments.

  • synctex support works when texlive.bin cross-compiles, so I'd love to get

I left a review.

@ghost ghost marked this pull request as draft April 6, 2023 05:44
@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 6, 2023

If ofborg is successful with the two builds I asked it to do in #223303, I adjust this PR to keep texlive for cross builds.

@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 7, 2023

Squashing...

@ghost ghost marked this pull request as ready for review April 7, 2023 06:05
@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 7, 2023

@ofborg build pkgsCross.aarch64-multiplatform.zathura

@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 24, 2023

@ofborg build zathura
@ofborg build pkgsCross.aarch64-multiplatform.zathura

The only part of zathura that won't cross compile is the tests.

Let's disable these so the binaries at least can be cross-built.

This commit also adds `check` to `buildInputs` and fixes the
reference to `sphinx`.

Co-authored-by: apfelkuchen6 <73002165+apfelkuchen6@users.noreply.github.com>
Co-authored-by: Artturi <Artturin@artturin.com>
@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 24, 2023

@ofborg build pkgsCross.aarch64-multiplatform.zathura

@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 24, 2023

Rebased, no other changes.

@ofborg build pkgsCross.aarch64-multiplatform.zathura

@ghost ghost changed the title zathura: disable manpages, synctex, docs, and tests if cross zathura: disable tests if cross Apr 24, 2023
@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 24, 2023

Ah right, this won't cross-build on master until #223303 is brought over from staging.

@ghost ghost merged commit d8409de into NixOS:master Apr 24, 2023
@ghost ghost deleted the pr/zathura/cross branch April 24, 2023 04:42
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants