pantheon.switchboard-plug-power: 2.4.2 -> 2.6.0
This commit is contained in:
@@ -2,14 +2,13 @@
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
, libgee
|
||||
, elementary-dpms-helper
|
||||
, elementary-settings-daemon
|
||||
, gnome-settings-daemon
|
||||
, granite
|
||||
, gtk3
|
||||
, glib
|
||||
@@ -20,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-power";
|
||||
version = "2.4.2";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-swcbkaHHe9BZxMWvjdRutvYfXXrSCUJWuld1btfYeH0=";
|
||||
sha256 = "006h8mrhmdrbd83vhdyahgrfk9wh6j9kjincpp7dz7sl8fsyhmcr";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
@@ -44,8 +43,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
elementary-dpms-helper
|
||||
elementary-settings-daemon
|
||||
gnome-settings-daemon
|
||||
glib
|
||||
granite
|
||||
gtk3
|
||||
@@ -54,13 +53,6 @@ stdenv.mkDerivation rec {
|
||||
switchboard
|
||||
];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./dpms-helper-exec.patch;
|
||||
elementary_dpms_helper = elementary-dpms-helper;
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Switchboard Power Plug";
|
||||
homepage = "https://github.com/elementary/switchboard-plug-power";
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/src/MainView.vala b/src/MainView.vala
|
||||
index 1654e68..175f220 100644
|
||||
--- a/src/MainView.vala
|
||||
+++ b/src/MainView.vala
|
||||
@@ -317,7 +317,7 @@ public class Power.MainView : Gtk.Grid {
|
||||
|
||||
private static void run_dpms_helper () {
|
||||
try {
|
||||
- string[] argv = { "io.elementary.dpms-helper" };
|
||||
+ string[] argv = { "@elementary_dpms_helper@/bin/io.elementary.dpms-helper" };
|
||||
Process.spawn_async (null, argv, Environ.get (),
|
||||
SpawnFlags.SEARCH_PATH | SpawnFlags.STDERR_TO_DEV_NULL | SpawnFlags.STDOUT_TO_DEV_NULL,
|
||||
null, null);
|
||||
Reference in New Issue
Block a user