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

Merge pull request #143513 from bobby285271/pantheon

Browse Source 
Pantheon updates 2021-10-28
This commit is contained in:
Bobby Rong 2021-10-29 09:46:19 +08:00 committed by GitHub
commit 3f33a306a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -283,6 +283,7 @@ in
elementary-music elementary-music
elementary-photos elementary-photos
elementary-screenshot elementary-screenshot
elementary-tasks
elementary-terminal elementary-terminal
elementary-videos elementary-videos
epiphany epiphany

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

@ -60,9 +60,8 @@ stdenv.mkDerivation rec {
''; '';
preInstall = '' preInstall = ''
# Install our override for plank dockitems as Appcenter and Tasks is not ready to be preinstalled. # Install our override for plank dockitems as Appcenter is not ready to be preinstalled.
# For Appcenter, see: https://github.com/NixOS/nixpkgs/issues/70214. # See: https://github.com/NixOS/nixpkgs/issues/70214.
# For Tasks, see: https://github.com/elementary/tasks/issues/243#issuecomment-846259496
schema_dir=$out/share/glib-2.0/schemas schema_dir=$out/share/glib-2.0/schemas
install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override

2
pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.tasks.dockitem Normal file
View File

@ -0,0 +1,2 @@
[PlankDockItemPreferences]
Launcher=file:///run/current-system/sw/share/applications/io.elementary.tasks.desktop

2
pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override
View File

@ -1,2 +1,2 @@
[net.launchpad.plank.dock.settings] [net.launchpad.plank.dock.settings]
dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem'] dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem']

4
pkgs/development/libraries/xdg-desktop-portal-pantheon/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-pantheon"; pname = "xdg-desktop-portal-pantheon";
version = "1.0.0"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = "portals"; repo = "portals";
rev = version; rev = version;
sha256 = "sha256-uPZUeyyn7HZwcBksY6X5s1bpbIRwqdCNfZKnkynVD+8="; sha256 = "sha256-8gBMjCMEzrFmKHhkXsgcIESC93EOT0ADkRUIJMmerjw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [