From b7426eaac4a3fe13ad32cc0b9b3b105c4511980e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 24 Aug 2024 00:03:04 +0800 Subject: [PATCH] pantheon.switchboard-plug-a11y: Drop ref: https://github.com/elementary/switchboard-plug-a11y ref: https://github.com/elementary/seeds/commit/e984d96df7bd83666901819f5f3eadb3ebbadbeb --- .../apps/switchboard-plugs/a11y/default.nix | 69 ------------------- .../switchboard-plugs/a11y/fix-paths.patch | 13 ---- pkgs/desktops/pantheon/default.nix | 5 +- 3 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix delete mode 100644 pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix deleted file mode 100644 index ae325e3bf8df..000000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, substituteAll -, fetchFromGitHub -, fetchpatch -, nix-update-script -, meson -, ninja -, pkg-config -, vala -, libgee -, granite -, gtk3 -, switchboard -, wingpanel-indicator-a11y -, onboard -}: - -stdenv.mkDerivation rec { - pname = "switchboard-plug-a11y"; - version = "2.3.0"; - - src = fetchFromGitHub { - owner = "elementary"; - repo = pname; - rev = version; - sha256 = "0dc5jv335j443rg08cb7p8wvmcg36wrf1vlcfg9r20cksdis9v4l"; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit onboard; - }) - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard-plug-a11y/pull/79 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-a11y/commit/08db4b696128a6bf809da3403a818834fcd62b02.patch"; - sha256 = "1s13ak23bdxgcb74wdz3ql192bla5qhabdicqyjv1rp32plhkbg5"; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - ]; - - buildInputs = [ - granite - gtk3 - libgee - switchboard - wingpanel-indicator-a11y - ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Switchboard Universal Access Plug"; - homepage = "https://github.com/elementary/switchboard-plug-a11y"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.pantheon.members; - }; -} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch deleted file mode 100644 index 4d69390f39d9..000000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Panes/Typing.vala b/src/Panes/Typing.vala -index b4ae8b0..5b8fd7e 100644 ---- a/src/Panes/Typing.vala -+++ b/src/Panes/Typing.vala -@@ -83,7 +83,7 @@ public class Accessibility.Panes.Typing : Categories.Pane { - - onboard_settings_label.clicked.connect (() => { - try { -- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE); -+ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE); - appinfo.launch (null, null); - } catch (Error e) { - warning ("%s\n", e.message); diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 3b62d7917174..05aef10ca6d6 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -4,7 +4,6 @@ lib.makeScope pkgs.newScope (self: with self; { switchboardPlugs = [ - switchboard-plug-a11y switchboard-plug-about switchboard-plug-applications switchboard-plug-bluetooth @@ -170,8 +169,6 @@ lib.makeScope pkgs.newScope (self: with self; { plugs = null; }; - switchboard-plug-a11y = callPackage ./apps/switchboard-plugs/a11y { }; - switchboard-plug-about = callPackage ./apps/switchboard-plugs/about { }; switchboard-plug-applications = callPackage ./apps/switchboard-plugs/applications { }; @@ -245,6 +242,8 @@ lib.makeScope pkgs.newScope (self: with self; { notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18 + switchboard-plug-a11y = throw "pantheon.switchboard-plug-a11y has been removed, abandoned by upstream."; # added 2024-08-23 + wingpanel-indicator-session = throw "pantheon.wingpanel-indicator-session has been removed, abandoned by upstream."; # added 2024-08-23 }