diff options
author | Artturin <Artturin@artturin.com> | 2023-06-22 14:49:31 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2023-06-28 22:33:40 +0300 |
commit | 9999bf7a21105486d44b759f56fd1a05fb312d9e (patch) | |
tree | 4d0b0bed1f00ef09918079d24d1c64b797c7e268 /pkgs/desktops/cinnamon | |
parent | 08285c3efb441d273ae25316c26414f8bfd01540 (diff) |
treewide: gobject-introspection from buildInputs to nativeBuildInputs
gobject-introspection should be in nativeBuildInputs for cross to work properly (so propagations and hook work properly)
Diffstat (limited to 'pkgs/desktops/cinnamon')
-rw-r--r-- | pkgs/desktops/cinnamon/bulky/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-desktop/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-menus/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cjs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/muffin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/nemo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/xapp/default.nix | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 9b4a7bf6b5f83..4863e0d4e1bb2 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { wrapGAppsHook gsettings-desktop-schemas gettext + gobject-introspection ]; buildInputs = [ (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ])) - gobject-introspection gsettings-desktop-schemas gtk3 glib diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 5e736ea1fdc85..e42e5a6069b9e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { xorg.libxkbfile xorg.libXext xorg.libXrandr - gobject-introspection ]; nativeBuildInputs = [ @@ -51,6 +50,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool pkg-config + gobject-introspection ]; postPatch = '' diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 1b5dbeb8d0853..444a68778664d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gobject-introspection ]; nativeBuildInputs = [ @@ -30,6 +29,7 @@ stdenv.mkDerivation rec { ninja wrapGAppsHook pkg-config + gobject-introspection ]; meta = with lib; { diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index c4cd8d9db02fb..195fff4a2433e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { libtool meson ninja + gobject-introspection ]; buildInputs = [ # from meson.build - gobject-introspection gtk3 glib diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 0c07b46822a73..681d6afd4ead2 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { pkg-config which # for locale detection libxml2 # for xml-stripblanks + gobject-introspection ]; buildInputs = [ - gobject-introspection cairo readline spidermonkey_102 diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 20a350cb525da..b36948ecbb5dc 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook xorgserver # for cvt command + gobject-introspection ]; buildInputs = [ @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { cinnamon-desktop dbus glib - gobject-introspection gtk3 libcanberra libdrm diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 18b2aff557ffa..cc43fe4d53886 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { libexif exempi gvfs - gobject-introspection libgsf ]; @@ -60,6 +59,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool shared-mime-info + gobject-introspection ]; mesonFlags = [ diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 7139dce15c79e..5b38d0662ea55 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { python3 vala wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection (python3.withPackages (ps: with ps; [ pygobject3 setproctitle # mate applet |