colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #156646 from bobby285271/pantheon

Browse Source 
Pantheon updates 2022-01-24
This commit is contained in:
Bobby Rong 2022-01-26 10:46:10 +08:00 committed by GitHub
commit 8021a4e39a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 381 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/desktops/pantheon/apps/elementary-code/default.nix
View File

@ -48,12 +48,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
appstream
desktop-file-utils
@ -95,6 +89,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Code editor designed for elementary OS";
homepage = "https://github.com/elementary/code";

16
pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
View File

@ -24,11 +24,9 @@ stdenv.mkDerivation rec {
pname = "elementary-feedback";
version = "6.1.0";
repoName = "feedback";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "feedback";
rev = version;
sha256 = "02wydbpa5qaa4xmmh4m7rbj4djbrn2i44zjakj5i6mzwjlj6sv5n";
};
@ -42,12 +40,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
gettext
meson
@ -74,6 +66,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "GitHub Issue Reporter designed for elementary OS";
homepage = "https://github.com/elementary/feedback";

14
pkgs/desktops/pantheon/apps/elementary-mail/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
@ -26,24 +25,15 @@
stdenv.mkDerivation rec {
pname = "elementary-mail";
version = "6.3.1";
version = "6.4.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "mail";
rev = version;
sha256 = "sha256-wOu9jvvwG53vzcNa38nk4eREZWW7Cin8el4qApQ8gI8=";
sha256 = "sha256-ooqVNMgeAqGlFcfachPPfhSiKTEEcNGv5oWdM7VLWOc=";
};
patches = [
# Fix build with meson 0.61
# https://github.com/elementary/mail/pull/751
(fetchpatch {
url = "https://github.com/elementary/mail/commit/bbadc56529276d8e0ff98e9df7d9bb1bf8fc5783.patch";
sha256 = "sha256-lJEnX5/G6e8PdKy1XGlwFIoCeSy6SR5p68tS4noj+44=";
})
];
nativeBuildInputs = [
appstream
desktop-file-utils

16
pkgs/desktops/pantheon/apps/elementary-music/default.nix
View File

@ -34,11 +34,9 @@ stdenv.mkDerivation rec {
pname = "elementary-music";
version = "5.1.1";
repoName = "music";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "music";
rev = version;
sha256 = "1wqsn4ss9acg0scaqpg514ll2dj3bl71wly4mm79qkinhy30yv9n";
};
@ -58,12 +56,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
desktop-file-utils
meson
@ -108,6 +100,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Music player and library designed for elementary OS";
homepage = "https://github.com/elementary/music";

4
pkgs/desktops/pantheon/apps/elementary-photos/default.nix
View File

@ -36,11 +36,9 @@ stdenv.mkDerivation rec {
pname = "elementary-photos";
version = "2.7.3";
repoName = "photos";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "photos";
rev = version;
sha256 = "sha256-ja4ElW0FNm9oNyn+00SdI2Cxep6LyWTYM8Blc6bnuiY=";
};

4
pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "elementary-tasks";
version = "6.1.0";
version = "6.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "tasks";
rev = version;
sha256 = "sha256-Gt9Hp9m28QdAFnKIT1xcbiSM5cn6kW7wEXmi/iFfu8k=";
sha256 = "sha256-eHaWXntLkk5G+cR5uFwWsIvbSPsbrvpglYBh91ta/M0=";
};
nativeBuildInputs = [

12
pkgs/desktops/pantheon/apps/sideload/default.nix
View File

@ -32,12 +32,6 @@ stdenv.mkDerivation rec {
sha256 = "0abpcawmmv5mgzk2i5n9rlairmjr2v9rg9b8c9g7xa085s496bi9";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
desktop-file-utils
gettext
@ -66,6 +60,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
homepage = "https://github.com/elementary/sideload";
description = "Flatpak installer, designed for elementary OS";

12
pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
View File

@ -40,12 +40,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -61,6 +55,12 @@ stdenv.mkDerivation rec {
wingpanel-indicator-a11y
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Universal Access Plug";
homepage = "https://github.com/elementary/switchboard-plug-a11y";

24
pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
View File

@ -29,11 +29,13 @@ stdenv.mkDerivation rec {
sha256 = "0c075ac7iqz4hqbp2ph0cwyhiq0jn6c1g1jjfhygjbssv3vvd268";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
patches = [
# Use NixOS's default wallpaper
(substituteAll {
src = ./fix-background-path.patch;
default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
})
];
nativeBuildInputs = [
meson
@ -53,13 +55,11 @@ stdenv.mkDerivation rec {
switchboard
];
patches = [
# Use NixOS's default wallpaper
(substituteAll {
src = ./fix-background-path.patch;
default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard About Plug";

12
pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
View File

@ -24,12 +24,6 @@ stdenv.mkDerivation rec {
sha256 = "18izmzhqp6x5ivha9yl8gyz9adyrsylw7w5p0cwm1bndgqbi7yh5";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -45,6 +39,12 @@ stdenv.mkDerivation rec {
switchboard
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Applications Plug";
homepage = "https://github.com/elementary/switchboard-plug-applications";

12
pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
View File

@ -35,12 +35,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -57,6 +51,12 @@ stdenv.mkDerivation rec {
wingpanel-indicator-bluetooth # settings schema
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Bluetooth Plug";
homepage = "https://github.com/elementary/switchboard-plug-bluetooth";

12
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
View File

@ -27,12 +27,6 @@ stdenv.mkDerivation rec {
sha256 = "10rqhxsqbl1xnz5n84d7m39c3vb71k153989xvyc55djia1wjx96";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
@ -61,6 +55,12 @@ stdenv.mkDerivation rec {
switchboard
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Date & Time Plug";
homepage = "https://github.com/elementary/switchboard-plug-datetime";

12
pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
View File

@ -24,12 +24,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-3sYZCazGnTjIi3Iry5673TMI13sD0GuY+46AK+NJH70=";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -45,6 +39,12 @@ stdenv.mkDerivation rec {
switchboard
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Displays Plug";
homepage = "https://github.com/elementary/switchboard-plug-display";

12
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
View File

@ -40,12 +40,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
libxml2
meson
@ -67,6 +61,12 @@ stdenv.mkDerivation rec {
switchboard
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Keyboard Plug";
homepage = "https://github.com/elementary/switchboard-plug-keyboard";

22
pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
View File

@ -29,11 +29,12 @@ stdenv.mkDerivation rec {
sha256 = "0nqgbpk1knvbj5xa078i0ka6lzqmaaa873gwj3mhjr5q2gzkw7y5";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
touchegg = touchegg;
})
];
nativeBuildInputs = [
meson
@ -54,12 +55,11 @@ stdenv.mkDerivation rec {
touchegg
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
touchegg = touchegg;
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Mouse & Touchpad Plug";

22
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
View File

@ -27,11 +27,12 @@ stdenv.mkDerivation rec {
sha256 = "0nqihsbrpjw4nx1c50g854bqybniw38adi78vzg8nyl6ikj2r0z4";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit networkmanagerapplet;
})
];
nativeBuildInputs = [
meson
@ -49,12 +50,11 @@ stdenv.mkDerivation rec {
switchboard
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit networkmanagerapplet;
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Networking Plug";

12
pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
View File

@ -34,12 +34,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -55,6 +49,12 @@ stdenv.mkDerivation rec {
switchboard
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Notifications Plug";
homepage = "https://github.com/elementary/switchboard-plug-notifications";

12
pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
View File

@ -28,12 +28,6 @@ stdenv.mkDerivation rec {
sha256 = "006h8mrhmdrbd83vhdyahgrfk9wh6j9kjincpp7dz7sl8fsyhmcr";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -53,6 +47,12 @@ stdenv.mkDerivation rec {
wingpanel-indicator-power # settings schema
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Power Plug";
homepage = "https://github.com/elementary/switchboard-plug-power";

12
pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
View File

@ -34,12 +34,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -55,6 +49,12 @@ stdenv.mkDerivation rec {
switchboard
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Printers Plug";
homepage = "https://github.com/elementary/switchboard-plug-printers";

12
pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
View File

@ -33,12 +33,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -53,6 +47,12 @@ stdenv.mkDerivation rec {
switchboard
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Sharing Plug";
homepage = "https://github.com/elementary/switchboard-plug-sharing";

12
pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
View File

@ -37,12 +37,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -62,6 +56,12 @@ stdenv.mkDerivation rec {
xorg.libXi
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Switchboard Wacom Plug";
homepage = "https://github.com/elementary/switchboard-plug-wacom";

12
pkgs/desktops/pantheon/apps/switchboard/default.nix
View File

@ -28,12 +28,6 @@ stdenv.mkDerivation rec {
sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
gettext
meson
@ -73,6 +67,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Extensible System Settings app for Pantheon";
homepage = "https://github.com/elementary/switchboard";

4
pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
View File

@ -12,11 +12,9 @@ stdenv.mkDerivation rec {
pname = "elementary-gtk-theme";
version = "6.1.1";
repoName = "stylesheet";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "stylesheet";
rev = version;
sha256 = "sha256-gciBn5MQ5Cu+dROL5kCt2GCbNA7W4HOWXyjMBd4OP+8=";
};

4
pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
View File

@ -15,11 +15,9 @@ stdenv.mkDerivation rec {
pname = "elementary-icon-theme";
version = "6.1.0";
repoName = "icons";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "icons";
rev = version;
sha256 = "sha256-WR4HV0nJKj0WeSFHXLK64O0LhX8myAJE4w0aztyhPn4=";
};

4
pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
View File

@ -11,11 +11,9 @@ stdenv.mkDerivation rec {
pname = "elementary-sound-theme";
version = "1.1.0";
repoName = "sound-theme";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "sound-theme";
rev = version;
sha256 = "sha256-fR6gtKx9J6o2R1vQZ5yx4kEX3Ak+q8I6hRVMZzyB2E8=";
};

4
pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
View File

@ -17,11 +17,9 @@ stdenv.mkDerivation rec {
pname = "elementary-default-settings";
version = "6.0.2";
repoName = "default-settings";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "default-settings";
rev = version;
sha256 = "sha256-qaPj/Qp7RYzHgElFdM8bHV42oiPUbCMTC9Q+MUj4Q6Y=";
};

62
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
View File

@ -40,16 +40,32 @@ stdenv.mkDerivation rec {
sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
xgreeters = linkFarm "pantheon-greeter-xgreeters" [{
path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
name = "io.elementary.greeter.desktop";
}];
};
patches = [
./sysconfdir-install.patch
# Needed until https://github.com/elementary/greeter/issues/360 is fixed
(substituteAll {
src = ./hardcode-fallback-background.patch;
default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
})
# Revert "UserCard: use accent color for logged_in check (#566)"
# https://github.com/elementary/greeter/pull/566
# Fixes crash issue reported in:
# https://github.com/elementary/greeter/issues/578
# https://github.com/NixOS/nixpkgs/issues/151609
# Probably also fixes:
# https://github.com/elementary/greeter/issues/568
# https://github.com/elementary/greeter/issues/583
# https://github.com/NixOS/nixpkgs/issues/140513
# Revisit this when the greeter is ported to GTK 4:
# https://github.com/elementary/greeter/pull/591
./revert-pr566.patch
# Fix build with meson 0.61
# https://github.com/elementary/greeter/pull/590
(fetchpatch {
url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch";
sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY=";
})
];
nativeBuildInputs = [
desktop-file-utils
@ -84,21 +100,6 @@ stdenv.mkDerivation rec {
"-Dgsd-dir=${gnome-settings-daemon}/libexec/" # trailing slash is needed
];
patches = [
./sysconfdir-install.patch
# Needed until https://github.com/elementary/greeter/issues/360 is fixed
(substituteAll {
src = ./hardcode-fallback-background.patch;
default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
})
# Fix build with meson 0.61
# https://github.com/elementary/greeter/pull/590
(fetchpatch {
url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch";
sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY=";
})
];
preFixup = ''
gappsWrapperArgs+=(
# dbus-launch needed in path
@ -125,6 +126,17 @@ stdenv.mkDerivation rec {
--replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter"
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
xgreeters = linkFarm "pantheon-greeter-xgreeters" [{
path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
name = "io.elementary.greeter.desktop";
}];
};
meta = with lib; {
description = "LightDM Greeter for Pantheon";
homepage = "https://github.com/elementary/greeter";

103
pkgs/desktops/pantheon/desktop/elementary-greeter/revert-pr566.patch Normal file
View File

@ -0,0 +1,103 @@
From 572a73cbc84dd9a0f5a7667a60c75ed5580d84a1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 25 Jan 2022 10:03:31 +0800
Subject: [PATCH] Revert "UserCard: use accent color for logged_in check
(#566)"
This reverts commit 6f18c79c780582e43039032f6926816efa82e206.
---
data/Check.css | 11 -----------
data/greeter.gresource.xml | 1 -
src/Cards/UserCard.vala | 29 +++--------------------------
3 files changed, 3 insertions(+), 38 deletions(-)
delete mode 100644 data/Check.css
diff --git a/data/Check.css b/data/Check.css
deleted file mode 100644
index 947db6b..0000000
--- a/data/Check.css
+++ /dev/null
@@ -1,11 +0,0 @@
-check {
- background-color: @accent_color;
- border-radius: 99px;
- color: white;
- margin: 2px;
- min-height: 20px;
- min-width: 20px;
- -gtk-icon-shadow: 0 1px 1px shade(@accent_color, 0.7);
- -gtk-icon-source: -gtk-icontheme("check-active-symbolic");
- -gtk-icon-transform: scale(0.6);
-}
diff --git a/data/greeter.gresource.xml b/data/greeter.gresource.xml
index 604c89a..ce9be29 100644
--- a/data/greeter.gresource.xml
+++ b/data/greeter.gresource.xml
@@ -2,7 +2,6 @@
<gresources>
<gresource prefix="/io/elementary/greeter">
<file alias="Card.css" compressed="true">Card.css</file>
- <file alias="Check.css" compressed="true">Check.css</file>
<file alias="DateTime.css" compressed="true">DateTime.css</file>
<file alias="MainWindow.css" compressed="true">MainWindow.css</file>
</gresource>
diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala
index 83df22c..02d2b0a 100644
--- a/src/Cards/UserCard.vala
+++ b/src/Cards/UserCard.vala
@@ -42,7 +42,6 @@ public class Greeter.UserCard : Greeter.BaseCard {
private Gtk.Stack login_stack;
private Greeter.PasswordEntry password_entry;
- private unowned Gtk.StyleContext logged_in_context;
private weak Gtk.StyleContext main_grid_style_context;
private weak Gtk.StyleContext password_entry_context;
@@ -214,14 +213,10 @@ public class Greeter.UserCard : Greeter.BaseCard {
};
avatar_overlay.add (avatar);
- var logged_in = new SelectionCheck () {
- halign = Gtk.Align.END,
- valign = Gtk.Align.END
- };
-
- logged_in_context = logged_in.get_style_context ();
-
if (lightdm_user.logged_in) {
+ var logged_in = new Gtk.Image.from_icon_name ("selection-checked", Gtk.IconSize.LARGE_TOOLBAR);
+ logged_in.halign = logged_in.valign = Gtk.Align.END;
+
avatar_overlay.add_overlay (logged_in);
session_button.sensitive = false;
@@ -304,7 +299,6 @@ public class Greeter.UserCard : Greeter.BaseCard {
gtksettings.gtk_theme_name = "io.elementary.stylesheet." + accent_to_string (prefers_accent_color);
var style_provider = Gtk.CssProvider.get_named (gtksettings.gtk_theme_name, null);
- logged_in_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
password_entry_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
}
@@ -451,21 +445,4 @@ public class Greeter.UserCard : Greeter.BaseCard {
return GLib.Source.REMOVE;
});
}
-
- private class SelectionCheck : Gtk.Spinner {
- private static Gtk.CssProvider check_provider;
-
- class construct {
- set_css_name (Gtk.STYLE_CLASS_CHECK);
- }
-
- static construct {
- check_provider = new Gtk.CssProvider ();
- check_provider.load_from_resource ("/io/elementary/greeter/Check.css");
- }
-
- construct {
- get_style_context ().add_provider (check_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER);
- }
- }
}

30
pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
View File

@ -26,15 +26,26 @@ stdenv.mkDerivation rec {
pname = "elementary-onboarding";
version = "6.1.0";
repoName = "onboarding";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "onboarding";
rev = version;
sha256 = "sha256-9voy9eje3VlV4IMM664EyjKWTfSVogX5JoRCqhsUXTE=";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
appcenter = appcenter;
})
# Provides the directory where the locales are actually installed
# https://github.com/elementary/onboarding/pull/147
(fetchpatch {
url = "https://github.com/elementary/onboarding/commit/af19c3dbefd1c0e0ec18eddacc1f21cb991f5513.patch";
sha256 = "sha256-fSFfjSd33W7rXXEUHY8b3rv9B9c31XfCjxjRxBBrqjs=";
})
];
nativeBuildInputs = [
gettext
meson
@ -56,19 +67,6 @@ stdenv.mkDerivation rec {
libhandy
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
appcenter = appcenter;
})
# Provides the directory where the locales are actually installed
# https://github.com/elementary/onboarding/pull/147
(fetchpatch {
url = "https://github.com/elementary/onboarding/commit/af19c3dbefd1c0e0ec18eddacc1f21cb991f5513.patch";
sha256 = "sha256-fSFfjSd33W7rXXEUHY8b3rv9B9c31XfCjxjRxBBrqjs=";
})
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py

16
pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
View File

@ -13,21 +13,13 @@ stdenv.mkDerivation rec {
pname = "elementary-print-shim";
version = "0.1.3";
repoName = "print";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "print";
rev = version;
sha256 = "sha256-l2IUu9Mj22lZ5yajPcsGrJcJDakNu4srCV0Qea5ybPA=";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -37,6 +29,12 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk3 ];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Simple shim for printing support via Contractor";
homepage = "https://github.com/elementary/print";

6
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
View File

@ -80,7 +80,7 @@ let
Name=Pantheon
Comment=This session provides elementary experience
Exec=@out@/libexec/pantheon
TryExec=${wingpanel}/bin/wingpanel
TryExec=${wingpanel}/bin/io.elementary.wingpanel
Icon=
DesktopNames=Pantheon
Type=Application
@ -92,11 +92,9 @@ stdenv.mkDerivation rec {
pname = "elementary-session-settings";
version = "6.0.0";
repoName = "session-settings";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "session-settings";
rev = version;
sha256 = "1faglpa7q3a4335gnd074a3lnsdspyjdnskgy4bfnf6xmwjx7kjx";
};

12
pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
View File

@ -34,12 +34,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -60,6 +54,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Universal Access Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-a11y";

12
pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
View File

@ -27,12 +27,6 @@ stdenv.mkDerivation rec {
sha256 = "12rasf8wy3cqnfjlm9s2qnx4drzx0w0yviagkng3kspdzm3vzsqy";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
glib # for glib-compile-schemas
libxml2
@ -57,6 +51,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Bluetooth Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth";

34
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
View File

@ -29,11 +29,18 @@ stdenv.mkDerivation rec {
sha256 = "10zzsil5l6snz47nx887r22sl2n0j6bg4dhxmgk3j3xp3jhgmrgl";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display";
})
# Upstream code not respecting our localedir
# https://github.com/elementary/wingpanel-indicator-keyboard/pull/110
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-keyboard/commit/ea5df2f62a99a216ee5ed137268e710490a852a4.patch";
sha256 = "0fmdz10xgzsryj0f0dnpjrh9yygjkb91a7pxg0rwddxbprhnr7j0";
})
];
nativeBuildInputs = [
meson
@ -52,18 +59,11 @@ stdenv.mkDerivation rec {
xorg.xkeyboardconfig
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display";
})
# Upstream code not respecting our localedir
# https://github.com/elementary/wingpanel-indicator-keyboard/pull/110
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-keyboard/commit/ea5df2f62a99a216ee5ed137268e710490a852a4.patch";
sha256 = "0fmdz10xgzsryj0f0dnpjrh9yygjkb91a7pxg0rwddxbprhnr7j0";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Keyboard Indicator for Wingpanel";

12
pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
View File

@ -34,12 +34,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
libxml2
meson
@ -55,6 +49,12 @@ stdenv.mkDerivation rec {
wingpanel
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Night Light Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-nightlight";

24
pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
View File

@ -30,11 +30,12 @@ stdenv.mkDerivation rec {
sha256 = "1zlpnl7983jkpy2nik08ih8lwrqvm456h993ixa6armzlazdvnjk";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
gnome_power_manager = gnome.gnome-power-manager;
})
];
nativeBuildInputs = [
meson
@ -55,18 +56,17 @@ stdenv.mkDerivation rec {
wingpanel
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
gnome_power_manager = gnome.gnome-power-manager;
})
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Power Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-power";

12
pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
View File

@ -35,12 +35,6 @@ stdenv.mkDerivation rec {
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -57,6 +51,12 @@ stdenv.mkDerivation rec {
wingpanel
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Session Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-session";

8
pkgs/desktops/pantheon/desktop/wingpanel/default.nix
View File

@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-WvkQx+9YjKCINpyVg8KjCV0GAb0rJfblSFaO14/4oas=";
};
patches = [
./indicators.patch
];
nativeBuildInputs = [
gettext
meson
@ -53,10 +57,6 @@ stdenv.mkDerivation rec {
mesa # for libEGL
];
patches = [
./indicators.patch
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py

12
pkgs/desktops/pantheon/services/contractor/default.nix
View File

@ -25,12 +25,6 @@ stdenv.mkDerivation rec {
sha256 = "1sqww7zlzl086pjww3d21ah1g78lfrc9aagrqhmsnnbji9gwb8ab";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
dbus
meson
@ -49,6 +43,12 @@ stdenv.mkDerivation rec {
PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services";
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "A desktop-wide extension service used by elementary OS";
homepage = "https://github.com/elementary/contractor";

4
pkgs/desktops/pantheon/services/elementary-notifications/default.nix
View File

@ -19,11 +19,9 @@ stdenv.mkDerivation rec {
pname = "elementary-notifications";
version = "6.0.0";
repoName = "notifications";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "notifications";
rev = version;
sha256 = "0jfppafbc8jwhhnillylicz4zfds789d8b31ifsx0qijlxa7kji9";
};

4
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
View File

@ -23,11 +23,9 @@ stdenv.mkDerivation rec {
pname = "elementary-settings-daemon";
version = "1.1.0";
repoName = "settings-daemon";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "settings-daemon";
rev = version;
sha256 = "sha256-1Xp1uJzDFuGZlhJhKj00cYtb4Q1syMAm+82fTOtk0VI=";
};

12
pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
View File

@ -25,12 +25,6 @@ stdenv.mkDerivation rec {
sha256 = "0hx3sky0vd2vshkscy3w5x3s18gd45cfqh510xhbmvc0sa32q9gd";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
desktop-file-utils
meson
@ -51,6 +45,12 @@ stdenv.mkDerivation rec {
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Pantheon Geoclue2 Agent";
homepage = "https://github.com/elementary/pantheon-agent-geoclue2";

12
pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
View File

@ -24,12 +24,6 @@ stdenv.mkDerivation rec {
sha256 = "1acqjjarl225yk0f68wkldsamcrzrj0ibpcxma04wq9w7jlmz60c";
};
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
meson
ninja
@ -45,6 +39,12 @@ stdenv.mkDerivation rec {
polkit
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Polkit Agent for the Pantheon Desktop";
homepage = "https://github.com/elementary/pantheon-agent-polkit";