JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vala: look for files in targetOffset

Browse Source 
when vala is in `nativeBuildInputs`, look for files in `buildInputs`.
This commit is contained in:
Artturin 2023-11-15 00:26:16 +02:00
parent cb502b4d17
commit 18951ce703
7 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome/apps/gnome-clocks/default.nix
View File

@ -9,7 +9,6 @@
, itstool
, desktop-file-utils
, vala
, gobject-introspection
, libxml2
, gtk4
, glib
@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
wrapGAppsHook4
desktop-file-utils
libxml2
gobject-introspection # for finding vapi files
];
buildInputs = [

4
pkgs/desktops/gnome/apps/seahorse/default.nix
View File

@ -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 = [

4
pkgs/desktops/gnome/core/baobab/default.nix
View File

@ -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 = [

2
pkgs/desktops/gnome/core/gnome-calculator/default.nix
View File

@ -12,7 +12,6 @@
, glib
, gtksourceview5
, wrapGAppsHook4
, gobject-introspection
, gnome
, mpfr
, gmp
@ -40,7 +39,6 @@ stdenv.mkDerivation rec {
gettext
itstool
wrapGAppsHook4
gobject-introspection # for finding vapi files
];
buildInputs = [

5
pkgs/desktops/gnome/games/gnome-mines/default.nix
View File

@ -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 {
@ -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 ];

2
pkgs/development/compilers/vala/setup-hook.sh
View File

@ -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

2
pkgs/development/libraries/libgnome-games-support/default.nix
View File

@ -2,7 +2,6 @@
, fetchurl
, pkg-config
, glib
, gobject-introspection
, gtk3
, libgee
, gettext
@ -24,7 +23,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
gettext
gobject-introspection
meson
ninja
pkg-config