From 7bec0408e7b9f9d176a2adbcc8184cdfeb39c617 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Nov 2021 16:51:18 +0800 Subject: [PATCH] pkgs/pantheon: remove unused `pantheon` from args --- pkgs/desktops/pantheon/apps/appcenter/default.nix | 1 - .../pantheon/apps/elementary-calculator/default.nix | 4 ++-- .../pantheon/apps/elementary-calendar/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-dock/default.nix | 1 - .../pantheon/apps/elementary-feedback/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-files/default.nix | 1 - pkgs/desktops/pantheon/apps/elementary-mail/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-music/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 6 +++--- .../pantheon/apps/elementary-screenshot/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-tasks/default.nix | 4 ++-- .../pantheon/apps/elementary-terminal/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 1 - pkgs/desktops/pantheon/apps/sideload/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/a11y/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/about/default.nix | 4 ++-- .../apps/switchboard-plugs/applications/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/bluetooth/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/datetime/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/display/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/keyboard/default.nix | 1 - .../apps/switchboard-plugs/mouse-touchpad/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/network/default.nix | 5 ++--- .../apps/switchboard-plugs/notifications/default.nix | 4 ++-- .../apps/switchboard-plugs/pantheon-shell/default.nix | 1 - .../pantheon/apps/switchboard-plugs/power/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/printers/default.nix | 4 ++-- .../apps/switchboard-plugs/security-privacy/default.nix | 1 - .../pantheon/apps/switchboard-plugs/sharing/default.nix | 4 ++-- .../pantheon/apps/switchboard-plugs/sound/default.nix | 1 - .../pantheon/apps/switchboard-plugs/wacom/default.nix | 4 ++-- pkgs/desktops/pantheon/apps/switchboard/default.nix | 4 ++-- .../pantheon/artwork/elementary-gtk-theme/default.nix | 1 - .../pantheon/artwork/elementary-icon-theme/default.nix | 1 - .../artwork/elementary-redacted-script/default.nix | 4 ++-- .../pantheon/artwork/elementary-sound-theme/default.nix | 4 ++-- .../pantheon/artwork/elementary-wallpapers/default.nix | 4 ++-- .../desktop/elementary-default-settings/default.nix | 1 - .../pantheon/desktop/elementary-greeter/default.nix | 4 ++-- .../pantheon/desktop/elementary-onboarding/default.nix | 1 - .../pantheon/desktop/elementary-print-shim/default.nix | 4 ++-- .../desktop/elementary-session-settings/default.nix | 4 ++-- .../desktop/elementary-shortcut-overlay/default.nix | 1 - .../desktop/extra-elementary-contracts/default.nix | 3 ++- pkgs/desktops/pantheon/desktop/gala/default.nix | 1 - .../desktop/wingpanel-indicators/a11y/default.nix | 4 ++-- .../wingpanel-indicators/applications-menu/default.nix | 4 ++-- .../desktop/wingpanel-indicators/bluetooth/default.nix | 4 ++-- .../desktop/wingpanel-indicators/datetime/default.nix | 1 - .../desktop/wingpanel-indicators/keyboard/default.nix | 4 ++-- .../desktop/wingpanel-indicators/network/default.nix | 1 - .../desktop/wingpanel-indicators/nightlight/default.nix | 4 ++-- .../wingpanel-indicators/notifications/default.nix | 4 ++-- .../desktop/wingpanel-indicators/power/default.nix | 4 ++-- .../desktop/wingpanel-indicators/session/default.nix | 4 ++-- .../desktop/wingpanel-indicators/sound/default.nix | 1 - pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 4 ++-- pkgs/desktops/pantheon/granite/default.nix | 1 - pkgs/desktops/pantheon/services/contractor/default.nix | 4 ++-- .../services/elementary-capnet-assist/default.nix | 4 ++-- .../services/elementary-notifications/default.nix | 4 ++-- .../services/elementary-settings-daemon/default.nix | 4 ++-- .../pantheon/services/pantheon-agent-geoclue2/default.nix | 8 ++++---- .../pantheon/services/pantheon-agent-polkit/default.nix | 4 ++-- 66 files changed, 99 insertions(+), 117 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 18cf1787f6db..6492c9332940 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -21,7 +21,6 @@ , meson , ninja , packagekit -, pantheon , pkg-config , python3 , vala diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 2e52d39a6da4..2878d750db8b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index d46e3c9c8ee9..019e2cf5a242 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 6a61c11d2dcb..0d434084c235 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index f35fec275299..97f6e1d5e80b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index 6b27441584a2..f23120c0b6dd 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -21,7 +21,6 @@ , gnome-menus , libgee , wrapGAppsHook -, pantheon , meson , ninja , granite diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 05ac02150d79..8a9256f2a615 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index bddc9d5acff6..dcd4591f1363 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index dd3e5268f9c2..402612108b66 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index c2b89e7111d0..bee11ed055bc 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 103d4692521b..ca7b6fd3a7d1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = with lib; { description = "Photo viewer and organizer designed for elementary OS"; homepage = "https://github.com/elementary/photos"; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index a4d966c6fc85..f2f4360aa59e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index 478fdc1db96c..52bda92ceb0d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , appstream , desktop-file-utils , meson diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 76c36f9e0704..f7799810ed81 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , fetchpatch -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index a87ac48c7f30..faeaab7ece18 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 98f4d9f3c91d..a065966ba1e3 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , desktop-file-utils , nix-update-script , elementary-gtk-theme @@ -13,7 +14,6 @@ , libhandy , meson , ninja -, pantheon , pkg-config , python3 , vala diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 949f1ecc3d0b..bcb7c39d17b4 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , substituteAll , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index f196ba970bd6..d48704736b1d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , substituteAll , meson , ninja diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 22c2f4f64af7..d24b75502600 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 2238125fe2f6..8f4b9fe32b27 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index b4518ea1e440..09717a584ce0 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , meson , ninja , substituteAll diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 8e6cbf080631..c25188add450 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 8c5071745178..01a3da26b1d5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , substituteAll , 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 0368314e7b4f..a765eca6de2d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , substituteAll -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 7ccfb265e9e9..b88f3f72d035 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { description = "Switchboard Networking Plug"; homepage = "https://github.com/elementary/switchboard-plug-network"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 42cddfd2d67f..fd5dfa328104 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , fetchpatch -, pantheon , meson , ninja , pkg-config 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 4932694eebd3..6fc961e4b5f5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 6a9848b34a7d..0e8168d299aa 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index cae5b570547f..dbca28038ab3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , fetchpatch -, pantheon , meson , ninja , pkg-config 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 98aa0926a4fb..550562f19b17 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , python3 , ninja diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 2eacf5585109..f41cfa2f7457 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , fetchpatch -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index b003ac1ce807..8a23f09838eb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix index 9268fa76aefc..e31768c764d4 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 418b0b931967..e78f4472a7bb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 6af2cbb8866d..b76a874490ed 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , gettext diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 2b5fa77b72ac..450275d1050d 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , python3 , ninja diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index b9c51f5688c2..97df0f9c78ac 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, pantheon }: stdenv.mkDerivation { diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index 6fe18119b458..6bad05693fea 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 9fd0a4d1a4e8..1ae25be5dcaf 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , gettext diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 7b0ea248ed61..a96bba4ab115 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , nixos-artwork diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 3d698a7807f9..18e00e63bccb 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , linkFarm , substituteAll , elementary-greeter -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index a7ee4ee7455a..e7a3d10b4fde 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -4,7 +4,6 @@ , fetchpatch , nix-update-script , substituteAll -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index b305c7626cba..119d5be21381 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index e3d0cb8c7282..2c0d2ae100c7 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , desktop-file-utils , pkg-config , writeScript -, pantheon , gnome-keyring , gnome-session , wingpanel diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index eb8563bc50d7..fbde187ce6dc 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix index 2db483cb5c7e..c579997f5e83 100644 --- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix +++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , substituteAll , fetchFromGitHub , file-roller diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 7dc6d79fee16..06021a37f511 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix index 7e185ece23ac..7ffc2cebab79 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , meson , ninja , pkg-config diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 15c301eee15a..d74907db9118 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , substituteAll , 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 a9b13650ddba..56d59ed4614a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index d9c2cdc90338..708e2b6eb0cc 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -4,7 +4,6 @@ , fetchpatch , nix-update-script , substituteAll -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 6d5227b7139f..4ce8fb0434f9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index a7ba66707a6e..fdb6481f7e7f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , nix-update-script , substituteAll -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 23f9e400c01b..ecaa05bc356c 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , fetchpatch , nix-update-script -, pantheon , pkg-config , 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 5adf2c7da6f5..a0a687985f91 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index f3d3ac0e46d5..38a8fb23701f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , substituteAll , nix-update-script -, pantheon , gnome , pkg-config , meson diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index eaccad35aa0b..510558f3cb6a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , fetchpatch -, pantheon , pkg-config , meson , ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 19f44d8d165e..16e04bedcb93 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index e22c654e1ef8..709a4e3e6140 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , wrapGAppsHook , pkg-config , meson diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 68ea9eb1417f..ec2255bbbc19 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -8,7 +8,6 @@ , vala , pkg-config , libgee -, pantheon , gtk3 , glib , gettext diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index 226344204879..a6c0cb8a3c53 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , meson , python3 , ninja diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index c687b281a2a7..ed9919b0b037 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , python3 diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 9dd5a8695258..2ea13c9cb595 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -10,7 +11,6 @@ , libgee , libhandy , libcanberra-gtk3 -, pantheon , python3 , wrapGAppsHook }: diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 79ced4bfe582..69a0c2a7bb1a 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja -, pantheon , pkg-config , python3 , vala diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index e2053ebf6a31..c135ea4e18ed 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { pkg-config vala wrapGAppsHook - ]; + ]; buildInputs = [ geoclue2 gtk3 libgee - ]; + ]; # This should be provided by a post_install.py script - See -> https://github.com/elementary/pantheon-agent-geoclue2/pull/21 postInstall = '' diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 4bef7fd5e08e..3644d9665df0 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, pantheon , pkg-config , meson , ninja