ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 06:47:09 +03:00
Code Issues Projects Releases Wiki Activity

pantheon.switchboard-plug-about: 2.5.2 -> 2.6.0

Browse Source 
* depends on elementary-feedback

* don't need to override pkgconfig anymore
  b513ee2e1c

* drop remove-update-button.patch
  The button isn't added if appcenter isn't installed now.

https://github.com/elementary/switchboard-plug-about/releases/tag/2.6.0
This commit is contained in:
worldofpeace 2019-09-18 17:14:08 -04:00
parent 2975e8482b
commit 96f72ebe93
4 changed files with 32 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
View File

@ -11,17 +11,18 @@
, gtk3
, switchboard
, pciutils
, elementary-feedback
}:
stdenv.mkDerivation rec {
pname = "switchboard-plug-about";
version = "2.5.2";
version = "2.6.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "11diwz2aj45yqkxdija8ny0sgm0wl2905gl3799cdl12ss9ffndp";
sha256 = "12ysymk5y2k49yh3rzmra7jmimxrd54gz2f4ssc9i8w06xj5djp7";
};
passthru = {
@ -46,17 +47,15 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./lspci-path.patch;
src = ./fix-paths.patch;
inherit pciutils;
elementary_feedback = elementary-feedback;
})
./remove-update-button.patch
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard About Plug";
homepage = https://github.com/elementary/witchboard-plug-about;
homepage = https://github.com/elementary/switchboard-plug-about;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = pantheon.maintainers;

26
pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/src/Plug.vala b/src/Plug.vala
index c32efcbe..0cdaeaca 100644
--- a/src/Plug.vala
+++ b/src/Plug.vala
@@ -178,7 +178,7 @@ public class About.Plug : Switchboard.Plug {
var bug_button = new Gtk.Button.with_label (_("Report a Problem"));
bug_button.clicked.connect (() => {
- var appinfo = new GLib.DesktopAppInfo ("io.elementary.feedback.desktop");
+ var appinfo = new GLib.DesktopAppInfo ("@elementary_feedback@/bin/io.elementary.feedback.desktop");
if (appinfo != null) {
try {
appinfo.launch (null, null);
diff --git a/src/Views/HardwareView.vala b/src/Views/HardwareView.vala
index f8113634..3794bad8 100644
--- a/src/Views/HardwareView.vala
+++ b/src/Views/HardwareView.vala
@@ -179,7 +179,7 @@ public class About.HardwareView : Gtk.Grid {
// Graphics
try {
- Process.spawn_command_line_sync ("lspci", out graphics);
+ Process.spawn_command_line_sync ("@pciutils@/bin/lspci", out graphics);
if ("VGA" in graphics) { //VGA-keyword indicates graphics-line
string[] lines = graphics.split("\n");

13
pkgs/desktops/pantheon/apps/switchboard-plugs/about/lspci-path.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/Views/HardwareView.vala b/src/Views/HardwareView.vala
index a3e449c..a95fe93 100644
--- a/src/Views/HardwareView.vala
+++ b/src/Views/HardwareView.vala
@@ -179,7 +179,7 @@ public class About.HardwareView : Gtk.Grid {
// Graphics
try {
- Process.spawn_command_line_sync ("lspci", out graphics);
+ Process.spawn_command_line_sync ("@pciutils@/bin/lspci", out graphics);
if ("VGA" in graphics) { //VGA-keyword indicates graphics-line
string[] lines = graphics.split("\n");

55
pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-update-button.patch
View File

@ -1,55 +0,0 @@
diff --git a/src/Plug.vala b/src/Plug.vala
index 76fca34..3e79c1f 100644
--- a/src/Plug.vala
+++ b/src/Plug.vala
@@ -65,7 +65,6 @@ public class About.Plug : Switchboard.Plug {
search_results.set ("%s → %s".printf (display_name, _("Restore Default Settings")), "");
search_results.set ("%s → %s".printf (display_name, _("Suggest Translation")), "");
search_results.set ("%s → %s".printf (display_name, _("Report Problems")), "");
- search_results.set ("%s → %s".printf (display_name, _("Updates")), "");
return search_results;
}
@@ -161,7 +160,7 @@ public class About.Plug : Switchboard.Plug {
var kernel_version_label = new Gtk.Label (kernel_version);
kernel_version_label.set_selectable (true);
- var gtk_version_label = new Gtk.Label (_("GTK+ %s").printf (gtk_version));
+ var gtk_version_label = new Gtk.Label (_("GTK+ %s").printf (gtk_version));
gtk_version_label.set_selectable (true);
var website_label = new Gtk.LinkButton.with_label (website_url, _("Website"));
@@ -202,16 +201,6 @@ public class About.Plug : Switchboard.Plug {
issue_dialog.run ();
});
- // Update button
- var update_button = new Gtk.Button.with_label (_("Check for Updates"));
- update_button.clicked.connect (() => {
- try {
- Process.spawn_command_line_async ("io.elementary.appcenter --show-updates");
- } catch (Error e) {
- warning (e.message);
- }
- });
-
// Restore settings button
var settings_restore_button = new Gtk.Button.with_label (_("Restore Default Settings"));
settings_restore_button.clicked.connect (settings_restore_clicked);
@@ -224,7 +213,6 @@ public class About.Plug : Switchboard.Plug {
button_grid.add (settings_restore_button);
button_grid.add (translate_button);
button_grid.add (bug_button);
- button_grid.add (update_button);
button_grid.set_child_non_homogeneous (help_button, true);
var software_grid = new Gtk.Grid ();
@@ -238,7 +226,7 @@ public class About.Plug : Switchboard.Plug {
software_grid.attach (based_off, 0, 2, 2, 1);
}
- software_grid.attach (kernel_version_label, 0, 3, 2, 1);
+ software_grid.attach (kernel_version_label, 0, 3, 2, 1);
software_grid.attach (gtk_version_label, 0, 4, 2, 1);
software_grid.attach (website_label, 0, 5, 2, 1);