From 1ff7e28086233e3ddf0be3a24d046eb148c987d8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 23 Aug 2024 21:29:50 +0800 Subject: [PATCH 01/13] pantheon.elementary-session-settings: 6.0.0-unstable-2024-03-29 -> 8.0.0 https://github.com/elementary/session-settings/compare/53bf57e5b32936befc3003a0f99c5b3a69349c76...8.0.0 --- .../desktop/elementary-session-settings/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index e85540b27ae5..9c67c245c8ae 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , nix-update-script , desktop-file-utils +, gettext , pkg-config , writeScript , gnome-keyring @@ -91,20 +92,18 @@ in stdenv.mkDerivation rec { pname = "elementary-session-settings"; - version = "6.0.0-unstable-2024-03-29"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "session-settings"; - # For systemd managed gnome-session support. - # https://github.com/NixOS/nixpkgs/issues/228946 - # nixpkgs-update: no auto update - rev = "53bf57e5b32936befc3003a0f99c5b3a69349c76"; - sha256 = "sha256-TX9V6gZiuPEKSHQoSD4+5QptuqEvuErCJ8OF2KFRf9k="; + rev = version; + sha256 = "sha256-CtArMzM6eukH/Ob0W/U4xh2vvqm17m3T0w7lhcRid74="; }; nativeBuildInputs = [ desktop-file-utils + gettext meson ninja pkg-config From 1ec06b188feef60145d472c7305a9bed5606f16d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 23 Aug 2024 21:33:00 +0800 Subject: [PATCH 02/13] pantheon.wingpanel-indicator-bluetooth: 7.0.1 -> 8.0.0 https://github.com/elementary/wingpanel-indicator-bluetooth/compare/7.0.1...8.0.0 --- .../wingpanel-indicators/bluetooth/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index a1422ec18354..edc35f146908 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -4,7 +4,6 @@ , nix-update-script , pkg-config , meson -, python3 , ninja , vala , gtk3 @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "7.0.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-VLW3r5X0AWhNRQpajYmCNMIl/UvZCWz14gpxZLlLJdQ="; + sha256 = "sha256-N0ehiK8sYAZ/3Lu2u7dut7ZflroFptALFCxjbI0++BA="; }; nativeBuildInputs = [ @@ -33,7 +32,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala ]; @@ -46,11 +44,6 @@ stdenv.mkDerivation rec { wingpanel ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; From 43f8c88e9c5e46c83862e1dd1a36e7f14af7ba50 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 25 Jul 2024 20:51:50 +0800 Subject: [PATCH 03/13] nixos/pantheon: Ship elementary-bluetooth-daemon by default This is extracted from wingpanel-indicator-bluetooth. --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 01bf3aad202a..3db6d4ffa45c 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -193,6 +193,7 @@ in # Global environment environment.systemPackages = (with pkgs.pantheon; [ + elementary-bluetooth-daemon elementary-session-settings elementary-settings-daemon gala From 5f153f6db406e1bd2afd334df31537ca636e99b7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 23 Aug 2024 21:36:35 +0800 Subject: [PATCH 04/13] pantheon.wingpanel-indicator-notifications: 7.1.0 -> 7.1.1 https://github.com/elementary/wingpanel-indicator-notifications/compare/7.1.0...7.1.1 --- .../desktop/wingpanel-indicators/notifications/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 921fa48d81c5..37101f298453 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "7.1.0"; + version = "7.1.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-vm+wMHyWWtOWM0JyiesfpzC/EmkTNbprXaBgVUDQvDg="; + sha256 = "sha256-fuC9ldDjKuy1kBeFOAIZ/Onhl2o45Xj+YjSrfYz1xvw="; }; nativeBuildInputs = [ From 3c1fa0d0e3ec2594c2be17f9e68efa845a85c05f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 23 Aug 2024 21:39:08 +0800 Subject: [PATCH 05/13] pantheon.wingpanel-indicator-power: 6.2.1 -> 8.0.0 https://github.com/elementary/wingpanel-indicator-power/compare/6.2.1...8.0.0 --- .../desktop/wingpanel-indicators/power/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 42e983da68f9..74bd1be5f24e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -8,9 +8,9 @@ , meson , ninja , vala +, elementary-settings-daemon , gtk3 , granite -, bamf , libgtop , libnotify , udev @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; - version = "6.2.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-EEY32O7GeXBHSjZQ3XGogT1sUzIKGX+CzcGx8buGLq4="; + sha256 = "sha256-RelK4HIyTQ6kXi7/K8U33sKIrDrhA3IFVnnvX4x88UQ="; }; patches = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - bamf + elementary-settings-daemon granite gtk3 libgee From 9cb4c03866f6b7f9086498eada63fdbb2f47975d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 23 Aug 2024 21:46:39 +0800 Subject: [PATCH 06/13] pantheon.wingpanel-indicator-sound: 7.0.0 -> 8.0.0 https://github.com/elementary/wingpanel-indicator-sound/compare/7.0.0...8.0.0 --- .../desktop/wingpanel-indicators/sound/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 61d8ee449739..eb4133d70827 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -4,7 +4,6 @@ , nix-update-script , pkg-config , meson -, python3 , ninja , vala , gnome-settings-daemon @@ -20,13 +19,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-sound"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-gQyL8g4Y5kM9/1EDLAQYiTSZ6CxuvfQv7LBRZNcGPVk="; + sha256 = "sha256-5VJnRFjyiy+CIOrwabmgWjVF4Jh0lfkhPUoGXivnbtY="; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala ]; @@ -49,11 +47,6 @@ stdenv.mkDerivation rec { wingpanel ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; From dfc226bfb1561b8538e365a7f1a5b62bcae19294 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 11 Jun 2024 21:22:33 +0800 Subject: [PATCH 07/13] nixos/pantheon: Enable switcheroo support https://github.com/elementary/dock/commit/317ae5e4820ab9d61618356ac2268e0676a771d9 --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 3db6d4ffa45c..a401af9b7e18 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -160,6 +160,7 @@ in services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; services.libinput.enable = mkDefault true; + services.switcherooControl.enable = mkDefault true; services.xserver.updateDbusEnvironment = true; services.zeitgeist.enable = mkDefault true; services.geoclue2.enable = mkDefault true; From e3e17841f539c1c900da45014e5ba38937115f51 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 23 Aug 2024 22:20:45 +0800 Subject: [PATCH 08/13] pantheon.wingpanel: Backport QuickSettings support --- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 3734a0dcc07f..e6fb2a57e7d2 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , wrapGAppsHook3 , pkg-config @@ -32,6 +33,13 @@ stdenv.mkDerivation rec { patches = [ ./indicators.patch + + # Add sorting for QuickSettings + # https://github.com/elementary/wingpanel/pull/516 + (fetchpatch { + url = "https://github.com/elementary/wingpanel/commit/cae197c953f4332e67cf0a5457b4e54f8adc3424.patch"; + hash = "sha256-P7Cl6M3qvh9pa1qIwWQV4XG5NoCQId+buzEChcUOapk="; + }) ]; nativeBuildInputs = [ From 2af847864f303d38001aebc0a9edaf7f6bf9938e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 May 2024 17:35:13 +0800 Subject: [PATCH 09/13] pantheon.wingpanel-quick-settings: init at 1.0.0 --- pkgs/desktops/pantheon/default.nix | 3 + .../quick-settings/default.nix | 65 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index e0f08e6e2031..10c8aa889c90 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -36,6 +36,7 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-power wingpanel-indicator-session wingpanel-indicator-sound + wingpanel-quick-settings ]; maintainers = lib.teams.pantheon.members; @@ -163,6 +164,8 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-sound = callPackage ./desktop/wingpanel-indicators/sound { }; + wingpanel-quick-settings = callPackage ./desktop/wingpanel-indicators/quick-settings { }; + #### SWITCHBOARD switchboard = callPackage ./apps/switchboard { }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix new file mode 100644 index 000000000000..e51621e52958 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix @@ -0,0 +1,65 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + glib, + meson, + ninja, + pkg-config, + vala, + elementary-settings-daemon, + granite, + gtk3, + libgee, + libhandy, + libportal, + packagekit, + wayland, + wingpanel, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wingpanel-quick-settings"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "quick-settings"; + rev = finalAttrs.version; + hash = "sha256-k8K6zGTLYGSsi5NtohbaGg4oVVovktR7BInN8BUE5bQ="; + }; + + nativeBuildInputs = [ + glib # glib-compile-resources + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + elementary-settings-daemon # for prefers-color-scheme + glib + granite + gtk3 + libgee + libhandy + libportal + packagekit + wayland + wingpanel + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Quick settings menu for Wingpanel"; + homepage = "https://github.com/elementary/quick-settings"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.pantheon.members; + }; +}) From 4fe688d7008d69051972713e4926de0f0f428cf0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 23 Aug 2024 22:07:54 +0800 Subject: [PATCH 10/13] pantheon.wingpanel-indicator-session: Drop --- pkgs/desktops/pantheon/default.nix | 5 +- .../wingpanel-indicators/session/default.nix | 55 ------------------- 2 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 10c8aa889c90..533340de7aa4 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -34,7 +34,6 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-nightlight wingpanel-indicator-notifications wingpanel-indicator-power - wingpanel-indicator-session wingpanel-indicator-sound wingpanel-quick-settings ]; @@ -160,8 +159,6 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (gnome) gnome-power-manager; }; - wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { }; - wingpanel-indicator-sound = callPackage ./desktop/wingpanel-indicators/sound { }; wingpanel-quick-settings = callPackage ./desktop/wingpanel-indicators/quick-settings { }; @@ -249,4 +246,6 @@ 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 + wingpanel-indicator-session = throw "pantheon.wingpanel-indicator-session has been removed, abandoned by upstream."; # added 2024-08-23 + } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix deleted file mode 100644 index eae385178db4..000000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix-update-script -, pkg-config -, meson -, ninja -, vala -, gtk3 -, granite -, wingpanel -, accountsservice -, libgee -, libhandy -}: - -stdenv.mkDerivation rec { - pname = "wingpanel-indicator-session"; - version = "2.3.1"; - - src = fetchFromGitHub { - owner = "elementary"; - repo = pname; - rev = version; - sha256 = "sha256-2AEMe5dctTicW1MiGRV1SMjN/uFxQGbOYzCNFS1/KNk="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - vala - ]; - - buildInputs = [ - accountsservice - granite - gtk3 - libgee - libhandy - wingpanel - ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Session Indicator for Wingpanel"; - homepage = "https://github.com/elementary/wingpanel-indicator-session"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = teams.pantheon.members; - }; -} From 954fa1cda6a2f6fbd0e7a56146727051ecc67abc Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 23 Aug 2024 23:28:53 +0800 Subject: [PATCH 11/13] onboard: Fix crashes at startup ... by apply various Void Linux's patches. Noticed when testing Pantheon's quick-settings indicator. --- pkgs/applications/misc/onboard/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index d6c7da1ffefb..2fcaa7f4c48a 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , lib , substituteAll , aspellWithDicts @@ -54,6 +55,22 @@ python3.pkgs.buildPythonApplication rec { }) # Allow loading hunspell dictionaries installed in NixOS system path ./hunspell-use-xdg-datadirs.patch + + # Python 3.12 fixes (otherwise crashes at startup) + (fetchpatch { + url = "https://github.com/void-linux/void-packages/raw/1be95325d320122efd5dedf7437839cfcca01f7a/srcpkgs/onboard/patches/python-3.12.patch"; + hash = "sha256-Lw5wlaWFlP5rFlEWmlPo5Ux8idrmhET/X9yiu+2Akkk="; + }) + (fetchpatch { + url = "https://github.com/void-linux/void-packages/raw/1be95325d320122efd5dedf7437839cfcca01f7a/srcpkgs/onboard/patches/thread-state.patch"; + hash = "sha256-fJfxD7HshroiEVkaKVBGV7py8tdOhbcprcmBQNuxR9U="; + }) + + # Fix for https://bugs.launchpad.net/onboard/+bug/1948723 + (fetchpatch { + url = "https://github.com/void-linux/void-packages/raw/9ef46bf26ac5acc1af5809f11c97b19c5e2233ed/srcpkgs/onboard/patches/fix-brokenformat.patch"; + hash = "sha256-r9mvJNWpPR1gsayuSSLpzIuafEKqtADYklre0Ju+KOM="; + }) ]; nativeBuildInputs = [ From 965065bc2a3f03c14b4f0e52deb5a5ff1e14aea7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 23 Aug 2024 23:58:48 +0800 Subject: [PATCH 12/13] pantheon.wingpanel-indicator-a11y: Don't ship by default https://github.com/elementary/seeds/commit/98b53a5835972b26989adbb36c6c42327c118346 --- pkgs/desktops/pantheon/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 533340de7aa4..3b62d7917174 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -26,7 +26,6 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanelIndicators = [ wingpanel-applications-menu - wingpanel-indicator-a11y wingpanel-indicator-bluetooth wingpanel-indicator-datetime wingpanel-indicator-keyboard From b7426eaac4a3fe13ad32cc0b9b3b105c4511980e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 24 Aug 2024 00:03:04 +0800 Subject: [PATCH 13/13] 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 }