alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pantheon.switchboard-plug-network: 2.2.0 -> 2.3.0

Browse source
This commit is contained in:
worldofpeace 2020-04-03 17:11:34 -04:00
parent 441d85c4c5
commit f38f4d73a5
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "switchboard-plug-network"; pname = "switchboard-plug-network";
version = "2.2.0"; version = "2.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0zg4bxrrw1nmm91yp8ymji7mha2wcjrwljcnpcvxq7lf8f2k0145"; sha256 = "0pqkr7swjgla8klcjdcwgk2fipiwvylk8m71l1fymazvzwxrbxw6";
}; };
passthru = { passthru = {

23
pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch
View file

@ -1,8 +1,8 @@
diff --git a/src/Views/VPNPage.vala b/src/Views/VPNPage.vala diff --git a/src/Views/VPNPage.vala b/src/Views/VPNPage.vala
index 82e7826..cf00145 100644 index ba9dc22..a12871a 100644
--- a/src/Views/VPNPage.vala --- a/src/Views/VPNPage.vala
+++ b/src/Views/VPNPage.vala +++ b/src/Views/VPNPage.vala
@@ -265,7 +265,7 @@ public class Network.VPNPage : Network.Widgets.Page { @@ -264,7 +264,7 @@ public class Network.VPNPage : Network.Widgets.Page {
private void try_connection_editor (string args) { private void try_connection_editor (string args) {
try { try {
var appinfo = AppInfo.create_from_commandline ( var appinfo = AppInfo.create_from_commandline (
@ -12,24 +12,15 @@ index 82e7826..cf00145 100644
GLib.AppInfoCreateFlags.NONE GLib.AppInfoCreateFlags.NONE
); );
diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala
index ed36b38..bc71c0c 100644 index 5849b69..7bbd172 100644
--- a/src/Widgets/SettingsButton.vala --- a/src/Widgets/SettingsButton.vala
+++ b/src/Widgets/SettingsButton.vala +++ b/src/Widgets/SettingsButton.vala
@@ -24,7 +24,7 @@ @@ -55,7 +55,7 @@ public class Network.Widgets.SettingsButton : Gtk.Button {
clicked.connect (() => { clicked.connect (() => {
try {
var appinfo = AppInfo.create_from_commandline (
- "nm-connection-editor",
+ "@networkmanagerapplet@/bin/nm-connection-editor",
null,
AppInfoCreateFlags.NONE
);
@@ -71,7 +71,7 @@
private void edit_connection_uuid (string uuid) {
try { try {
var appinfo = AppInfo.create_from_commandline ( var appinfo = AppInfo.create_from_commandline (
- "nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE - "nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE
+ "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE + "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE
); );
appinfo.launch (null, null); appinfo.launch (null, null);