Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9409f5ba2d4d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 834a49e0d4a9
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 23, 2020

  1. elementary-planner: cleanup 

    * add elementary theme
The program forces this theme to be used
* update description
    @worldofpeace
    worldofpeace committed Apr 23, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    bwoodsend Brénainn Woodsend
    GPG key ID: 52B5C9300BEF567E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    19c3bbf View commit details

  2. pantheon.elementary-greeter: add elementary-gtk-theme

    @worldofpeace
    worldofpeace committed Apr 23, 2020
    Copy the full SHA
    6cecb19 View commit details

  3. pantheon.wingpanel: add elementary-gtk-theme

    @worldofpeace
    worldofpeace committed Apr 23, 2020
    Copy the full SHA
    834a49e View commit details
21 changes: 17 additions & 4 deletions pkgs/applications/office/elementary-planner/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{ stdenv, fetchFromGitHub, fetchpatch
, meson, ninja, pkgconfig, desktop-file-utils
, python3, vala, wrapGAppsHook
{ stdenv
, fetchFromGitHub
, meson
, ninja
, pkgconfig
, desktop-file-utils
, python3
, vala
, wrapGAppsHook
, evolution-data-server
, libical
, libgee
@@ -63,8 +69,15 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson/post_install.py
'';

preFixup = ''
gappsWrapperArgs+=(
# the theme is hardcoded
--prefix XDG_DATA_DIRS : "${pantheon.elementary-gtk-theme}/share"
)
'';

meta = with stdenv.lib; {
description = "Task and project manager designed to elementary OS";
description = "Task manager with Todoist support designed for GNU/Linux 🚀️";
homepage = "https://planner-todo.web.app";
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ] ++ pantheon.maintainers;
3 changes: 3 additions & 0 deletions pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -103,6 +103,9 @@ stdenv.mkDerivation rec {
# for the compositor
--prefix PATH : "$out/bin"
# the theme is hardcoded
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
)
'';

7 changes: 7 additions & 0 deletions pkgs/desktops/pantheon/desktop/wingpanel/default.nix
View file
Original file line number Diff line number Diff line change
@@ -65,6 +65,13 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';

preFixup = ''
gappsWrapperArgs+=(
# this theme is required
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
)
'';

meta = with stdenv.lib; {
description = "The extensible top panel for Pantheon";
longDescription = ''