From 246f4949ede10370f98742e815172858509e4364 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 2 Feb 2022 09:53:39 +0800 Subject: [PATCH] pkgs/pantheon: minor formatting Simply because all other Pantheon packages have addressed these formatting. --- .../pantheon/apps/elementary-videos/default.nix | 11 ++++++----- pkgs/desktops/pantheon/default.nix | 4 +++- .../desktop/wingpanel-indicators/power/default.nix | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 494b50605e97..cb1ea291225b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -40,21 +40,22 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gst_all_1; [ + buildInputs = [ clutter-gst clutter-gtk elementary-icon-theme granite + gtk3 + libgee + libhandy + ] ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer - gtk3 - libgee - libhandy - ]; + ]); postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 617c6ed086da..e005f08ba30a 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -161,7 +161,9 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-notifications = callPackage ./desktop/wingpanel-indicators/notifications { }; - wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { }; + wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { + inherit (gnome) gnome-power-manager; + }; wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 6c300536b2f8..ac9803495574 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , substituteAll , nix-update-script -, gnome +, gnome-power-manager , pkg-config , meson , python3 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - gnome_power_manager = gnome.gnome-power-manager; + gnome_power_manager = gnome-power-manager; }) ];