tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
pantheon.wingpanel-indicator-network: 2.3.0 -> 2.3.1
Bobby Rong
4 years ago
6a0e026b
6ef3339c
+4
-31
2 changed files
expand all
collapse all
unified
split
pkgs
desktops
pantheon
desktop
wingpanel-indicators
network
default.nix
fix-paths.patch
+4
-18
pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
···
1
1
-
{ lib, stdenv
1
1
+
{ lib
2
2
+
, stdenv
2
3
, fetchFromGitHub
3
3
-
, fetchpatch
4
4
, nix-update-script
5
5
, substituteAll
6
6
, pantheon
···
14
14
, libnma
15
15
, wingpanel
16
16
, libgee
17
17
-
, elementary-capnet-assist
18
17
}:
19
18
20
19
stdenv.mkDerivation rec {
21
20
pname = "wingpanel-indicator-network";
22
22
-
version = "2.3.0";
21
21
+
version = "2.3.1";
23
22
24
23
src = fetchFromGitHub {
25
24
owner = "elementary";
26
25
repo = pname;
27
26
rev = version;
28
28
-
sha256 = "0q5ad2sj0nmigrh1rykb2kvik3hzibzyafdvkkmjd6y92145lwl1";
27
27
+
sha256 = "sha256-xr1ZihWK8fU8M/rXRKk5dOjoQNe3aJO8ouKC/iVZ7Sk=";
29
28
};
30
29
31
30
passthru = {
···
48
47
networkmanager
49
48
libnma
50
49
wingpanel
51
51
-
];
52
52
-
53
53
-
patches = [
54
54
-
(substituteAll {
55
55
-
src = ./fix-paths.patch;
56
56
-
elementary_capnet_assist = elementary-capnet-assist;
57
57
-
})
58
58
-
# Upstream code not respecting our localedir
59
59
-
# https://github.com/elementary/wingpanel-indicator-network/pull/228
60
60
-
(fetchpatch {
61
61
-
url = "https://github.com/elementary/wingpanel-indicator-network/commit/eacc7d46a94a980005e87e38e6c943143a09692a.patch";
62
62
-
sha256 = "1svg07fqmplchp1ass0h8qkr3g24pkw8dcsnd54ddmvnjzwrzz0a";
63
63
-
})
64
50
];
65
51
66
52
meta = with lib; {
-13
pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch
···
1
1
-
diff --git a/src/Indicator.vala b/src/Indicator.vala
2
2
-
index 83ce932a..f95ed142 100644
3
3
-
--- a/src/Indicator.vala
4
4
-
+++ b/src/Indicator.vala
5
5
-
@@ -67,7 +67,7 @@ public class Network.Indicator : Wingpanel.Indicator {
6
6
-
7
7
-
if (network_monitor.get_connectivity () == NetworkConnectivity.FULL || network_monitor.get_connectivity () == NetworkConnectivity.PORTAL) {
8
8
-
try {
9
9
-
- var appinfo = AppInfo.create_from_commandline ("io.elementary.capnet-assist", null, AppInfoCreateFlags.NONE);
10
10
-
+ var appinfo = AppInfo.create_from_commandline ("@elementary_capnet_assist@/bin/io.elementary.capnet-assist", null, AppInfoCreateFlags.NONE);
11
11
-
appinfo.launch (null, null);
12
12
-
} catch (Error e) {
13
13
-
warning ("%s\n", e.message);