Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cinnamon.cinnamon-session: init at 4.4.0 #78445

Merged
merged 1 commit into from Mar 31, 2020
Merged

cinnamon.cinnamon-session: init at 4.4.0 #78445

merged 1 commit into from Mar 31, 2020

Conversation

mkg20001
Copy link
Member

Motivation for this change

More cinnamon

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

flokli
flokli requested changes Jan 24, 2020
View reviewed changes
pkgs/desktops/cinnamon/cinnamon-session/default.nix Outdated Show resolved Hide resolved
pkgs/desktops/cinnamon/cinnamon-session/default.nix Outdated Show resolved Hide resolved
pkgs/desktops/cinnamon/cinnamon-session/default.nix Outdated Show resolved Hide resolved
pkgs/desktops/cinnamon/cinnamon-session/default.nix Outdated Show resolved Hide resolved
@mkg20001 mkg20001 force-pushed the pkg/cinnamon-session branch 2 times, most recently from f2bb408 to 216baa2 Compare March 22, 2020 16:05
@mkg20001 mkg20001 requested a review from flokli March 22, 2020 16:06
worldofpeace
worldofpeace reviewed Mar 23, 2020
View reviewed changes
pkgs/desktops/cinnamon/cinnamon-session/default.nix Outdated
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
--suffix XDG_DATA_DIRS : "${cinnamon-desktop}/share"
--suffix XDG_DATA_DIRS : "${cinnamon-settings-daemon}/etc/xdg"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be XDG_CONFIG_DIRS? See the xdg spec

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and let's make these all --prefix as well.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I took that from the old cinnamon port, no clue what this stuff does

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe cinnamon-settings-daemon has xdg autostart, and similar to gnome-session (if you look at the expression) it needs them or it won't be able to start the session properly.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had other applications with etc/xdg and just the application having it was enough for that to work, so I'm not sure if this is needed then

@flokli flokli removed their request for review March 24, 2020 22:38
@worldofpeace
Copy link
Contributor

This should be good with the above, if I'm remembering things correctly.

@worldofpeace
Copy link
Contributor

We can fix the dbus_glib issue later.

@worldofpeace worldofpeace merged commit 22536bf into NixOS:master Mar 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace left review comments

@flokli flokli flokli requested changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mkg20001 @worldofpeace @flokli