Skip to content

vala: look for files in targetOffset #267550

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.

Sign up for GitHub

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

Merged
Artturin merged 1 commit into from
Dec 1, 2023
Merged

vala: look for files in targetOffset #267550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pkgs/desktops/gnome/apps/gnome-clocks/default.nix
View file
Open in desktop
Copy link
Member Author

@Artturin Artturin Nov 14, 2023

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

@Artturin Artturin Nov 15, 2023

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

@uninsane uninsane Nov 22, 2023

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 •
edited
Loading

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

nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix

Lines 366 to 377 in ba1a718

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

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
, itstool
, desktop-file-utils
, vala
, gobject-introspection
, libxml2
, gtk4
, glib
Expand Down Expand Up @@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
wrapGAppsHook4
desktop-file-utils
libxml2
gobject-introspection # for finding vapi files
];

buildInputs = [
Expand Down
4 changes: 0 additions & 4 deletions pkgs/desktops/gnome/apps/seahorse/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ stdenv.mkDerivation rec {
gnupg
desktop-file-utils
gcr
# error: Package `...' not found in specified Vala API directories or GObject-Introspection GIR directories
# TODO: the vala setuphook should look for vala filess in targetOffset instead of hostOffset
libhandy
libsecret
];

buildInputs = [
Expand Down
4 changes: 0 additions & 4 deletions pkgs/desktops/gnome/core/baobab/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ stdenv.mkDerivation rec {
pkg-config
vala
wrapGAppsHook4
# Prevents “error: Package `libadwaita-1' not found in specified Vala API
# directories or GObject-Introspection GIR directories” with strictDeps,
# even though it should only be a runtime dependency.
libadwaita
];

buildInputs = [
Expand Down
2 changes: 0 additions & 2 deletions pkgs/desktops/gnome/core/gnome-calculator/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
, glib
, gtksourceview5
, wrapGAppsHook4
, gobject-introspection
, gnome
, mpfr
, gmp
Expand Down Expand Up @@ -40,7 +39,6 @@ stdenv.mkDerivation rec {
gettext
itstool
wrapGAppsHook4
gobject-introspection # for finding vapi files
];

buildInputs = [
Expand Down
5 changes: 2 additions & 3 deletions pkgs/desktops/gnome/games/gnome-mines/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome, gtk3, wrapGAppsHook
{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gnome, gtk3, wrapGAppsHook
, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }:

stdenv.mkDerivation rec {
Expand All @@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "NQLps/ccs7LnEcDmAZGH/rzCvKh349RW3KtwD3vjEnI=";
};

# gobject-introspection for finding vapi files
nativeBuildInputs = [
meson ninja vala gobject-introspection pkg-config gettext itstool python3
meson ninja vala pkg-config gettext itstool python3
libxml2 wrapGAppsHook desktop-file-utils
];
buildInputs = [ gtk3 librsvg gnome.adwaita-icon-theme libgnome-games-support libgee ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/vala/setup-hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ make_vala_find_vapi_files() {
fi
}

addEnvHooks "$hostOffset" make_vala_find_vapi_files
addEnvHooks "$targetOffset" make_vala_find_vapi_files

disable_incompabile_pointer_conversion_warning() {
# Work around incompatible function pointer conversion errors with clang 16
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/libraries/libgnome-games-support/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
, fetchurl
, pkg-config
, glib
, gobject-introspection
, gtk3
, libgee
, gettext
Expand All @@ -24,7 +23,6 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
gettext
gobject-introspection
meson
ninja
pkg-config
Expand Down