about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-02-02 09:53:39 +0800
committerBobby Rong <rjl931189261@126.com>2022-02-02 13:47:58 +0800
commit246f4949ede10370f98742e815172858509e4364 (patch)
tree38f11dad48bc000893b352a3498dd598e80599ec /pkgs/desktops
parentbe1e44b7d2319b96973f0d7cad6db29ce4831478 (diff)
downloadnixlib-246f4949ede10370f98742e815172858509e4364.tar
nixlib-246f4949ede10370f98742e815172858509e4364.tar.gz
nixlib-246f4949ede10370f98742e815172858509e4364.tar.bz2
nixlib-246f4949ede10370f98742e815172858509e4364.tar.lz
nixlib-246f4949ede10370f98742e815172858509e4364.tar.xz
nixlib-246f4949ede10370f98742e815172858509e4364.tar.zst
nixlib-246f4949ede10370f98742e815172858509e4364.zip
pkgs/pantheon: minor formatting
Simply because all other Pantheon packages have addressed these formatting.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/pantheon/apps/elementary-videos/default.nix11
-rw-r--r--pkgs/desktops/pantheon/default.nix4
-rw-r--r--pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix4
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;
     })
   ];