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

vala: look for files in targetOffset #267550

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Conversation

Artturin
Copy link
Member

when vala is in nativeBuildInputs, look for files in buildInputs.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Nov 14, 2023
Copy link
Member Author

Choose a reason for hiding this comment

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

pkgsCross.aarch64-multiplatform.gnome.gnome-clocks doesn't build anymore :(

fails with

error: builder for '/nix/store/s617q8r4jjzbk9ggqkdaxm40qfrdgjl1-qtsvg-5.15.10.drv' failed with exit code 1;
       last 3 log lines:
       > Error: detected mismatched Qt dependencies:
       >     /nix/store/br4gj9l8s4zlf0w66zscvhznvg0q45zj-qtbase-5.15.10-dev
       >     /nix/store/jfsn6q4hqr75fram7kvqjh1d00lp7dsa-qtbase-5.15.10-dev
       For full logs, run 'nix log /nix/store/s617q8r4jjzbk9ggqkdaxm40qfrdgjl1-qtsvg-5.15.10.drv'.
error: 1 dependencies of derivation '/nix/store/dk2c0f4lghxsjj7p93dh86wrr50jm2jl-python3.11-PyQt5-5.15.9.drv' failed to build
error: 1 dependencies of derivation '/nix/store/jlkbwc40kwv6d9imv8jd8c3r1dcygp9x-ffado-2.4.7.drv' failed to build
error: 1 dependencies of derivation '/nix/store/75ma0q1ksl6a2hhi6ficlji76rvb7qnz-pipewire-0.3.80.drv' failed to build
error: 1 dependencies of derivation '/nix/store/8w0nikpm948g5fg13l626wcsh6bj5ch0-SDL2-2.28.3.drv' failed to build
error: 1 dependencies of derivation '/nix/store/366dkm8yshzfylr78ja6r0p4jl8cyvxc-openal-soft-1.23.1.drv' failed to build
error: 1 dependencies of derivation '/nix/store/kzaq6jq6923z8a6ssqx3zrv8g0ffm9zr-gst-plugins-bad-1.22.6.drv' failed to build
error: 1 dependencies of derivation '/nix/store/14hc07w3g6viw4ib8wcswklpkc8cj7i5-gtk4-4.10.4.drv' failed to build
error: 1 dependencies of derivation '/nix/store/818xgfgjayq8jmf9ksgv4r9qywasm0hi-wrap-gapps-hook.drv' failed to build
error: 1 dependencies of derivation '/nix/store/k5p6gikvndp1pl66s23rgmpmw7gdawa3-gnome-clocks-aarch64-unknown-linux-gnu-44.0.drv' failed to build

Copy link
Member Author

Choose a reason for hiding this comment

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

seahorse builds successfully

Copy link
Contributor

Choose a reason for hiding this comment

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

i've seen this failure recently, without the vala patch. i notice in pipewire that the ffado component is conditional:

ffadoSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform

yet here we are building ffado, presumably for pipewire, and getting the same type of error as back when this was unconditional. maybe #242782 has some hints.

Copy link
Member Author

@Artturin Artturin Nov 22, 2023

Choose a reason for hiding this comment

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

Possibly caused by #264903 or #264965

These

bootstrapScope = baseScope.overrideScope(final: prev: {
qtbase = prev.qtbase.override { qttranslations = null; };
qtdeclarative = null;
});
finalScope = baseScope.overrideScope(final: prev: {
# qttranslations causes eval-time infinite recursion when
# cross-compiling; disabled for now.
qttranslations =
if stdenv.buildPlatform == stdenv.hostPlatform
then bootstrapScope.qttranslations
else null;
are really fragile

Maybe #220518 would help

@Artturin
Copy link
Member Author

Rougly went through vala in nativeBuildInputs but I expect there won't be many breakages because people but the libs in both nativeBuildInputs and buildInputs

Copy link
Member Author

Choose a reason for hiding this comment

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

Accidentally committed, will remove

@@ -45,9 +45,6 @@ stdenv.mkDerivation rec {
desktop-file-utils
libxml2
gobject-introspection # for finding vapi files
Copy link
Contributor

Choose a reason for hiding this comment

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

presumably this gobject-introspection can be removed while you're here too, going by the comment.

@Artturin Artturin force-pushed the valaoffset branch 2 times, most recently from 4fbbb63 to 333f227 Compare November 22, 2023 17:45
Copy link
Contributor

@uninsane uninsane left a comment

Choose a reason for hiding this comment

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

diff looks fine. too many rebuilds for me to nixpkgs-review, but i cross compiled and deployed this to my aarch64 box and it's working as expected 👍️