dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pantheon.switchboard-plug-network: 2.5.0 -> 8.0.0

Browse Source 
https://github.com/elementary/switchboard-plug-network/compare/2.5.0...8.0.0
This commit is contained in:
Bobby Rong 2024-05-16 23:09:02 +08:00
parent 887b03c884
commit 3d09da64ee
No known key found for this signature in database
2 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
View File

@ -7,24 +7,25 @@
, pkg-config
, substituteAll
, vala
, libadwaita
, libgee
, granite
, gtk3
, granite7
, gtk4
, networkmanager
, networkmanagerapplet
, libnma
, libnma-gtk4
, switchboard
}:
stdenv.mkDerivation rec {
pname = "switchboard-plug-network";
version = "2.5.0";
version = "8.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
hash = "sha256-Dd7sZ66iyfuoHeQYrhlx9G9g4ylGq1IBlkTF5zFlVBQ=";
hash = "sha256-N/S4oO7wwOMJZhQeqAeLBOMEsJtoKItxmGhsLHMuOoM=";
};
patches = [
@ -42,11 +43,12 @@ stdenv.mkDerivation rec {
];
buildInputs = [
granite
gtk3
granite7
gtk4
libadwaita
libgee
networkmanager
libnma
libnma-gtk4
switchboard
];

42
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
index ba9dc22..a12871a 100644
index 21488d1e..f9915e5d 100644
--- a/src/Views/VPNPage.vala
+++ b/src/Views/VPNPage.vala
@@ -264,7 +264,7 @@ public class Network.VPNPage : Network.Widgets.Page {
@@ -279,7 +279,7 @@ public class Network.VPNPage : Network.Widgets.Page {
private void try_connection_editor (string args) {
try {
var appinfo = AppInfo.create_from_commandline (
@ -11,16 +11,38 @@ index ba9dc22..a12871a 100644
null,
GLib.AppInfoCreateFlags.NONE
);
diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala
index 5849b69..7bbd172 100644
--- a/src/Widgets/SettingsButton.vala
+++ b/src/Widgets/SettingsButton.vala
@@ -55,7 +55,7 @@ public class Network.Widgets.SettingsButton : Gtk.Button {
clicked.connect (() => {
diff --git a/src/Widgets/Page.vala b/src/Widgets/Page.vala
index cbcc8357..c6276d5a 100644
--- a/src/Widgets/Page.vala
+++ b/src/Widgets/Page.vala
@@ -189,7 +189,7 @@ namespace Network.Widgets {
protected void edit_connections () {
try {
var appinfo = AppInfo.create_from_commandline (
- "nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE
+ "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE
- "nm-connection-editor", null, AppInfoCreateFlags.NONE
+ "@networkmanagerapplet@/bin/nm-connection-editor", null, AppInfoCreateFlags.NONE
);
appinfo.launch (null, null);
} catch (Error e) {
@@ -200,7 +200,7 @@ namespace Network.Widgets {
protected void open_advanced_settings () {
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/VPNInfoDialog.vala b/src/Widgets/VPN/VPNInfoDialog.vala
index e647c43b..44ce61c6 100644
--- a/src/Widgets/VPN/VPNInfoDialog.vala
+++ b/src/Widgets/VPN/VPNInfoDialog.vala
@@ -70,7 +70,7 @@ public class Network.Widgets.VPNInfoDialog : Granite.MessageDialog {
if (response == 1) {
try {
var appinfo = AppInfo.create_from_commandline (
- "nm-connection-editor --edit=%s".printf (connection.get_uuid ()),
+ "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (connection.get_uuid ()),
null,
GLib.AppInfoCreateFlags.NONE
);