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

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

Browse source 
Don't need pkgconfig override because of
* d02cbe61cb

https://github.com/elementary/switchboard-plug-network/releases/tag/2.2.0
This commit is contained in:
worldofpeace 2019-11-19 14:35:53 -05:00
parent b8c90535c3
commit daccdcfb77
3 changed files with 39 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-network";
version = "2.1.4";
version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "12lvcc15jngzsa40fjhxa6kccs58h5qq4lqrc7lcx5przmfaik8k";
sha256 = "0zg4bxrrw1nmm91yp8ymji7mha2wcjrwljcnpcvxq7lf8f2k0145";
};
passthru = {
@ -49,14 +49,12 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./nma.patch;
networkmanagerapplet = networkmanagerapplet;
src = ./fix-paths.patch;
inherit networkmanagerapplet;
})
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; {
description = "Switchboard Networking Plug";
homepage = https://github.com/elementary/switchboard-plug-network;

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

@ -0,0 +1,35 @@
diff --git a/src/Views/VPNPage.vala b/src/Views/VPNPage.vala
index 82e7826..cf00145 100644
--- a/src/Views/VPNPage.vala
+++ b/src/Views/VPNPage.vala
@@ -265,7 +265,7 @@ public class Network.VPNPage : Network.Widgets.Page {
private void try_connection_editor (string args) {
try {
var appinfo = AppInfo.create_from_commandline (
- "nm-connection-editor %s".printf (args),
+ "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args),
null,
GLib.AppInfoCreateFlags.NONE
);
diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala
index ed36b38..bc71c0c 100644
--- a/src/Widgets/SettingsButton.vala
+++ b/src/Widgets/SettingsButton.vala
@@ -24,7 +24,7 @@
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 {
var appinfo = AppInfo.create_from_commandline (
- "nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
+ "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
);
appinfo.launch (null, null);

43
pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch
View file

@ -1,43 +0,0 @@
diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala
index 19fd514..bc800d9 100644
--- a/src/Widgets/SettingsButton.vala
+++ b/src/Widgets/SettingsButton.vala
@@ -23,7 +23,7 @@
label = _("Edit Connections…");
clicked.connect (() => {
try {
- var appinfo = AppInfo.create_from_commandline ("nm-connection-editor", null, AppInfoCreateFlags.NONE);
+ var appinfo = AppInfo.create_from_commandline ("@networkmanagerapplet@/bin/nm-connection-editor", null, AppInfoCreateFlags.NONE);
appinfo.launch (null, null);
} catch (Error e) {
warning ("%s", e.message);
@@ -61,13 +61,13 @@
label = title;
clicked.connect (() => {
edit_connection_uuid (connection.get_uuid ());
- });
+ });
}
private void edit_connection_uuid (string uuid) {
try {
var appinfo = AppInfo.create_from_commandline (
- "nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
+ "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
);
appinfo.launch (null, null);
diff --git a/src/Widgets/VPN/VPNPage.vala b/src/Widgets/VPN/VPNPage.vala
index 23c3ae9..c71984c 100644
--- a/src/Widgets/VPN/VPNPage.vala
+++ b/src/Widgets/VPN/VPNPage.vala
@@ -86,8 +86,7 @@ namespace Network {
add_button.tooltip_text = _("Add VPN Connection…");
add_button.clicked.connect (() => {
add_button.sensitive = false;
- var command = new Granite.Services.SimpleCommand ("/usr/bin",
- "nm-connection-editor --create --type=vpn");
+ var command = new Granite.Services.SimpleCommand ("@networkmanagerapplet@", "bin/nm-connection-editor --create --type=vpn");
command.done.connect ((exit) => {
if (exit != 0) {
var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, "%s", _("Failed to run Connection Editor."));