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

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