From ebc6b672508245d4689d146bead5b99a556abdcd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 11 Jun 2019 02:26:53 -0400 Subject: [PATCH] pantheon: drop gobject-introspection for setup-hook Vala now has the setup-hook we need. [0] [0]: https://github.com/NixOS/nixpkgs/commit/79ca7f4cb4ab0842fd31ea3c1acfcb6f7baae55e --- .../pantheon/apps/elementary-calculator/default.nix | 5 ++--- pkgs/desktops/pantheon/apps/elementary-calendar/default.nix | 3 +-- pkgs/desktops/pantheon/apps/elementary-files/default.nix | 3 +-- pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 3 +-- .../pantheon/apps/elementary-screenshot-tool/default.nix | 3 +-- pkgs/desktops/pantheon/apps/elementary-terminal/default.nix | 3 +-- pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 3 +-- .../pantheon/apps/switchboard-plugs/a11y/default.nix | 3 +-- .../pantheon/apps/switchboard-plugs/about/default.nix | 5 ++--- .../apps/switchboard-plugs/applications/default.nix | 5 ++--- .../pantheon/apps/switchboard-plugs/bluetooth/default.nix | 5 ++--- .../pantheon/apps/switchboard-plugs/datetime/default.nix | 3 +-- .../pantheon/apps/switchboard-plugs/display/default.nix | 5 ++--- .../pantheon/apps/switchboard-plugs/keyboard/default.nix | 5 ++--- .../apps/switchboard-plugs/mouse-touchpad/default.nix | 3 +-- .../pantheon/apps/switchboard-plugs/network/default.nix | 3 +-- .../apps/switchboard-plugs/notifications/default.nix | 5 ++--- .../apps/switchboard-plugs/onlineaccounts/default.nix | 3 +-- .../apps/switchboard-plugs/pantheon-shell/default.nix | 3 +-- .../pantheon/apps/switchboard-plugs/power/default.nix | 3 +-- .../pantheon/apps/switchboard-plugs/printers/default.nix | 3 +-- .../apps/switchboard-plugs/security-privacy/default.nix | 3 +-- .../pantheon/apps/switchboard-plugs/sharing/default.nix | 3 +-- .../pantheon/apps/switchboard-plugs/sound/default.nix | 6 ++---- pkgs/desktops/pantheon/apps/switchboard/default.nix | 3 +-- .../pantheon/desktop/elementary-greeter/default.nix | 3 +-- .../desktop/elementary-shortcut-overlay/default.nix | 3 +-- pkgs/desktops/pantheon/desktop/gala/default.nix | 5 ++--- .../desktop/wingpanel-indicators/bluetooth/default.nix | 3 +-- .../desktop/wingpanel-indicators/datetime/default.nix | 4 +--- .../desktop/wingpanel-indicators/keyboard/default.nix | 3 +-- .../desktop/wingpanel-indicators/network/default.nix | 3 +-- .../desktop/wingpanel-indicators/nightlight/default.nix | 4 +--- .../desktop/wingpanel-indicators/notifications/default.nix | 3 +-- .../pantheon/desktop/wingpanel-indicators/power/default.nix | 3 +-- .../desktop/wingpanel-indicators/session/default.nix | 3 +-- .../pantheon/desktop/wingpanel-indicators/sound/default.nix | 3 +-- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 4 +--- pkgs/desktops/pantheon/granite/default.nix | 2 +- pkgs/desktops/pantheon/services/cerbere/default.nix | 3 +-- .../pantheon/services/elementary-capnet-assist/default.nix | 3 +-- .../pantheon/services/pantheon-agent-geoclue2/default.nix | 3 +-- .../pantheon/services/pantheon-agent-polkit/default.nix | 3 +-- 43 files changed, 52 insertions(+), 98 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 9aed8ffcc272..4a4850a0824e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig , meson, ninja, vala, desktop-file-utils, libxml2 -, gtk3, python3, granite, libgee, gobject-introspection -, elementary-icon-theme, appstream, wrapGAppsHook }: +, gtk3, python3, granite, libgee, elementary-icon-theme +, appstream, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "calculator"; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream desktop-file-utils - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index c165df26f60b..9f684c22767d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -2,7 +2,7 @@ , ninja, vala, desktop-file-utils, gtk3, granite, libgee , geoclue2, libchamplain, clutter, folks, geocode-glib, python3 , libnotify, libical, evolution-data-server, appstream-glib -, elementary-icon-theme, gobject-introspection, wrapGAppsHook }: +, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "calendar"; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream-glib desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index c90d9a566f8d..99c7afffe7a5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, gettext, vala , python3, desktop-file-utils, libcanberra, gtk3, libgee, granite, libnotify , libunity, pango, plank, bamf, sqlite, libdbusmenu-gtk3, zeitgeist, glib-networking -, elementary-icon-theme, gobject-introspection, wrapGAppsHook }: +, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "files"; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { desktop-file-utils gettext glib-networking - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 4ee2aef17601..32e9a0bcc8db 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils , gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2, fetchpatch , granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3 -, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, gobject-introspection, elementary-icon-theme }: +, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, elementary-icon-theme }: stdenv.mkDerivation rec { pname = "photos"; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 2644d31d7983..b1a5796770d9 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, callPackage , ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee -, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, libcanberra, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93 @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 9b2060afa6b7..2c146169f427 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 , vala, desktop-file-utils, gtk3, libxml2, granite, libnotify, vte, libgee -, elementary-icon-theme, appstream, gobject-introspection, wrapGAppsHook }: +, elementary-icon-theme, appstream, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "terminal"; @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream desktop-file-utils - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index b123d4cbf5bc..2d978d966b93 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3 , desktop-file-utils, gtk3, granite, libgee, clutter-gst, clutter-gtk, gst_all_1 -, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "videos"; @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 1883e2294797..859e04eb954d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: +, vala, libgee, granite, gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-a11y"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index d217ad20d2ed..6d7ecbffa314 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, pciutils, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja +, pkgconfig, vala, libgee, granite, gtk3, switchboard, pciutils }: stdenv.mkDerivation rec { pname = "switchboard-plug-about"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index ed4dc0c84473..0d7586391ce0 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, ninja +, pkgconfig, vala, libgee, granite, gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-applications"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index db653a7f8ffe..547b6d897e4e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee -, granite, gtk3, bluez, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, bluez, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-bluetooth"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 8c00ff4728e8..e1303a3cc48a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, substituteAll, pkgconfig -, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata, gobject-introspection }: +, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata }: stdenv.mkDerivation rec { pname = "switchboard-plug-datetime"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index f5fbb0a51cfb..22fb795297e0 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, ninja +, pkgconfig, vala, libgee, granite, gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-display"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 50256b8f77d7..71f865bdeb62 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig, vala, libgee -, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index eaf15fdb8155..a55a525c79bd 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, fetchpatch, meson, ninja, pkgconfig, vala -, libgee, granite, gtk3, switchboard, elementary-settings-daemon, gobject-introspection }: +, libgee, granite, gtk3, switchboard, elementary-settings-daemon }: stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 95b558901d20..283a13bd82aa 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, substituteAll, vala -, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard, gobject-introspection }: +, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-network"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index a6fb86bb828c..277f70cf984c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, ninja +, pkgconfig, vala, libgee, granite, gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-notifications"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 0417d33df7d7..496a69ce1f6b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala , libgee, granite, gtk3, libaccounts-glib, libsignon-glib, json-glib -, librest, webkitgtk, libsoup, switchboard, gobject-introspection }: +, librest, webkitgtk, libsoup, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 6c29282652c8..4d6a1f5c5c67 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala , libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop -, gala, wingpanel, plank, switchboard, gettext, gobject-introspection, bamf }: +, gala, wingpanel, plank, switchboard, gettext, bamf }: stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 0178f23f5e1a..0179aac84ced 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja , pkgconfig, vala, libgee, elementary-dpms-helper, elementary-settings-daemon -, makeWrapper, granite, gtk3, dbus, polkit, switchboard, gobject-introspection }: +, makeWrapper, granite, gtk3, dbus, polkit, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-power"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 11bd70894edd..293faad51c74 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, cups, switchboard, gobject-introspection }: +, vala, libgee, granite, gtk3, cups, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-printers"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index ff59768e363f..9cbab8f2c9f8 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, meson, python3, ninja , pkgconfig, vala, libgee, granite, gtk3, polkit, zeitgeist -, switchboard, lightlocker, pantheon-agent-geoclue2, gobject-introspection }: +, switchboard, lightlocker, pantheon-agent-geoclue2 }: stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 9660daa7715d..265352ed8815 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: +, vala, libgee, granite, gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-sharing"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index ad379f37471a..907bdc37e2a7 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3 -, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee +, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3, switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 310230c7aacc..12edf97f6ba9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja , vala, gtk3, libgee, granite, gettext, clutter-gtk, libunity -, elementary-icon-theme, wrapGAppsHook, gobject-introspection }: +, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "switchboard"; @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 32083d3ada62..177837c76dc0 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, substituteAll, makeWrapper, meson , ninja, vala, desktop-file-utils, gtk3, granite, libgee, elementary-settings-daemon -, gnome-desktop, mutter, gobject-introspection, elementary-icon-theme, wingpanel-with-indicators +, gnome-desktop, mutter, elementary-icon-theme, wingpanel-with-indicators , elementary-gtk-theme, nixos-artwork, elementary-default-settings, lightdm, numlockx , clutter-gtk, libGL, dbus, wrapGAppsHook }: @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 6ceebf1980c6..ca0ab888f149 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, libxml2, desktop-file-utils -, gtk3, glib, granite, libgee, elementary-icon-theme, gobject-introspection, wrapGAppsHook }: +, gtk3, glib, granite, libgee, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "shortcut-overlay"; @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index bc29dba9718e..1005c4090f3f 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala , desktop-file-utils, gettext, libxml2, gtk3, granite, libgee, bamf, libcanberra -, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, gobject-introspection -, elementary-icon-theme, elementary-settings-daemon, wrapGAppsHook }: +, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, elementary-icon-theme +, elementary-settings-daemon, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gala"; @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils gettext - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 571dab02c318..4d7868a1d14c 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3 , ninja, vala, gtk3, granite, libnotify, wingpanel, libgee, libxml2 -, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 297e99fe47b1..8a4c9f393839 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, python3 , ninja, substituteAll, vala, gtk3, granite, wingpanel, evolution-data-server -, libical, libgee, libxml2, libsoup, gobject-introspection -, elementary-calendar, elementary-icon-theme, wrapGAppsHook }: +, libical, libgee, libxml2, libsoup, elementary-calendar, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; @@ -21,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index f34ca29a98bb..aa63f82c9652 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja , substituteAll, vala, gtk3, granite, libxml2, wingpanel, libgee -, xorg, libgnomekbd, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, xorg, libgnomekbd, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-keyboard"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja libxml2 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 2ac05fdc6d82..a201d6864a66 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala , gtk3, granite, networkmanager, networkmanagerapplet, wingpanel -, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, libgee, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 8e450726976b..fd4e1cc7e177 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala -, gtk3, granite, wingpanel, libgee, libxml2, gobject-introspection -, elementary-icon-theme, wrapGAppsHook }: +, gtk3, granite, wingpanel, libgee, libxml2, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-nightlight"; @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 6a7fcfbb4e03..03369c3ad42e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, gtk3, granite -, wingpanel, libgee, libwnck3, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, wingpanel, libgee, libwnck3, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 45a4e543b662..a9af53449c9a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3 , ninja, vala, gtk3, granite, bamf, libgtop, udev, wingpanel -, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, libgee, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index a46e001e7a0e..5b1bd161b05f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson , ninja, vala, gtk3, granite, wingpanel, accountsservice -, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: +, libgee, elementary-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index fc40c2faf5ef..3e17813fde2a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson , python3, ninja, vala, gtk3, granite, wingpanel, libnotify , pulseaudio, libcanberra-gtk3, libgee, libxml2, wrapGAppsHook -, gobject-introspection, elementary-icon-theme }: +, elementary-icon-theme }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-sound"; @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection libxml2 meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 9c18eaed6da2..7cd7fd2b482c 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, fetchpatch, wrapGAppsHook, pkgconfig, meson, ninja -, vala, gala, gtk3, libgee, granite, gettext, glib-networking, mutter, json-glib -, python3, gobject-introspection }: +, vala, gala, gtk3, libgee, granite, gettext, glib-networking, mutter, json-glib, python3 }: stdenv.mkDerivation rec { pname = "wingpanel"; @@ -22,7 +21,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext glib-networking - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 66ba331ddcdc..cc612407bf61 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, gobject-introspection, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "granite"; diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix index 59983469c114..da5e544b0058 100644 --- a/pkgs/desktops/pantheon/services/cerbere/default.nix +++ b/pkgs/desktops/pantheon/services/cerbere/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, gobject-introspection, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "cerbere"; @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index e77948ccf295..055706b1521a 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala -, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, gobject-introspection, wrapGAppsHook }: +, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "capnet-assist"; @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 2487c4ba3af4..4b055d47b0a0 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, ninja, vala, glib -, gtk3, libgee, desktop-file-utils, geoclue2, gobject-introspection, wrapGAppsHook }: +, gtk3, libgee, desktop-file-utils, geoclue2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pantheon-agent-geoclue2"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja pkgconfig diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 4fdaa4a8bf9f..d9e5512ce784 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja -, vala, gtk3, libgee, polkit, gobject-introspection, wrapGAppsHook }: +, vala, gtk3, libgee, polkit, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pantheon-agent-polkit"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gobject-introspection meson ninja pkgconfig