Skip to content

vala: search for vapi files in targetOffset, not hostOffset #269171

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

Closed
uninsane wants to merge 3 commits into from
Closed

vala: search for vapi files in targetOffset, not hostOffset #269171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6990fa8
vala: search for vapi files in targetOffset, not hostOffset
uninsane Nov 22, 2023
af30d68
gnome.seahorse: remove extraneous nativeBuildInputs
uninsane Nov 22, 2023
a93ccf1
libgnome-games-support: remove unused gobject-introspection dependency
uninsane Nov 22, 2023
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
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
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