pantheon.elementary-capnet-assist: 2.3.0 -> 2.4.0

main
Bobby Rong 3 years ago
parent af2ac84863
commit ffa5563d2b
No known key found for this signature in database
GPG Key ID: ED07364437C91161
  1. 21
      pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
  2. 13
      pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch

@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "elementary-capnet-assist";
version = "2.3.0";
version = "2.4.0";
repoName = "capnet-assist";
@ -27,13 +27,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1gma8a04ndivx1fd3ha9f45r642qq2li80wrd6dsrp4v3vqix9bn";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
sha256 = "sha256-UdkS+w61c8z2TCJyG7YsDb0n0b2LOpFyaHzMbdCJsZI=";
};
nativeBuildInputs = [
@ -55,16 +49,17 @@ stdenv.mkDerivation rec {
webkitgtk
];
# Not useful here or in elementary - See: https://github.com/elementary/capnet-assist/issues/3
patches = [
./remove-capnet-test.patch
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "A small WebKit app that assists a user with login when a captive portal is detected";
homepage = "https://github.com/elementary/capnet-assist";

@ -1,13 +0,0 @@
diff --git a/meson.build b/meson.build
index 46c594b..ba0ea10 100644
--- a/meson.build
+++ b/meson.build
@@ -33,8 +33,3 @@ meson.add_install_script('meson/post_install.py')
subdir('data')
subdir('po')
-
-install_data(
- '90captive_portal_test',
- install_dir: join_paths(get_option('sysconfdir'), 'NetworkManager', 'dispatcher.d')
-)
Loading…
Cancel
Save