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

pantheon.wingpanel-indicator-network: 2.3.0 -> 2.3.1

Browse Source
This commit is contained in:
Bobby Rong 2021-10-26 09:33:38 +08:00
parent 6ef3339cfb
commit 6a0e026b01
No known key found for this signature in database
GPG Key ID: ED07364437C91161
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, substituteAll
, pantheon
@ -14,18 +14,17 @@
, libnma
, wingpanel
, libgee
, elementary-capnet-assist
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-network";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0q5ad2sj0nmigrh1rykb2kvik3hzibzyafdvkkmjd6y92145lwl1";
sha256 = "sha256-xr1ZihWK8fU8M/rXRKk5dOjoQNe3aJO8ouKC/iVZ7Sk=";
};
passthru = {
@ -50,19 +49,6 @@ stdenv.mkDerivation rec {
wingpanel
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
elementary_capnet_assist = elementary-capnet-assist;
})
# Upstream code not respecting our localedir
# https://github.com/elementary/wingpanel-indicator-network/pull/228
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-network/commit/eacc7d46a94a980005e87e38e6c943143a09692a.patch";
sha256 = "1svg07fqmplchp1ass0h8qkr3g24pkw8dcsnd54ddmvnjzwrzz0a";
})
];
meta = with lib; {
description = "Network Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-network";

13
pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/Indicator.vala b/src/Indicator.vala
index 83ce932a..f95ed142 100644
--- a/src/Indicator.vala
+++ b/src/Indicator.vala
@@ -67,7 +67,7 @@ public class Network.Indicator : Wingpanel.Indicator {
if (network_monitor.get_connectivity () == NetworkConnectivity.FULL || network_monitor.get_connectivity () == NetworkConnectivity.PORTAL) {
try {
- var appinfo = AppInfo.create_from_commandline ("io.elementary.capnet-assist", null, AppInfoCreateFlags.NONE);
+ var appinfo = AppInfo.create_from_commandline ("@elementary_capnet_assist@/bin/io.elementary.capnet-assist", null, AppInfoCreateFlags.NONE);
appinfo.launch (null, null);
} catch (Error e) {
warning ("%s\n", e.message);