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

cinnamon.cinnamon-desktop: init at 4.4.0 #78060

Merged
merged 1 commit into from Jan 20, 2020

Conversation

mkg20001
Copy link
Member

Motivation for this change

Needed for nemo #77979

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.

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

There's optional alsa support https://github.com/linuxmint/cinnamon-desktop/blob/8fa6c1e329ab5b57f4df566d332fe112b58f5bff/meson_options.txt#L5, not sure if we want that.

There's some libraries in Requries and I not sure if they're relevant for the girs

cvc.pc
Requires: gio-2.0, libpulse, libpulse-mainloop-glib, gobject-2.0

cinnamon-desktop.pc
Requires: gtk+-3.0

That's glib gtk3 and pulseaudio.

postPatch = ''
chmod +x install-scripts/meson_install_schemas.py # patchShebangs requires executable file
patchShebangs install-scripts/meson_install_schemas.py
sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/*
Copy link
Contributor

Choose a reason for hiding this comment

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

We should try to hardcode these paths into the schemas from which package they come from.
I'm seeing

I'm not sure what package these sounds come from, so I guess you can leave them unpatched and fix them when you add the package. (guessing cinnamon-sounds?)

Copy link
Member Author

Choose a reason for hiding this comment

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

It's from cinnamon-common which is the root package

Circular dependency if we patch this properly?

maciej@mkg-lenovo:~/Projekte/nixpkgs$ readlink -f /usr/share/cinnamon/sounds/
/nix/store/k6plfqprqx4600cz7v623knflqkzqzdi-cinnamon-common-4.4.1/share/cinnamon/sounds

(also don't ask me about the dark magic that made /usr/share a thing xD)

Copy link
Contributor

Choose a reason for hiding this comment

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

It's from cinnamon-common which is the root package

Do you mean it's at the top of the dependency tree?
If so then it shouldn't be an issue, but if ciinnamon-common depends on cinnamon-desktop it will be circular, and we'd have to ask cinnamon to ship those files somewhere else.

pkgs/desktops/cinnamon/cinnamon-desktop/default.nix Outdated Show resolved Hide resolved
@mkg20001 mkg20001 force-pushed the pkg/cinnamon-desktop branch 2 times, most recently from ce1b5a7 to 13489be Compare January 20, 2020 00:49
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Builds for me, LGTM.

@worldofpeace worldofpeace merged commit a65f338 into NixOS:master Jan 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants