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

deepin.dde-session-ui: 4.9.11 -> 4.9.12 #63781

Merged
merged 1 commit into from Jul 5, 2019
Merged

deepin.dde-session-ui: 4.9.11 -> 4.9.12 #63781

merged 1 commit into from Jul 5, 2019

Conversation

romildo
Copy link
Contributor

@romildo romildo commented Jun 25, 2019

Motivation for this change
  • Update to version 4.9.12
  • Revise hard coded paths
  • Wrap binaries in lib/deepin-daemon/

About packaging deepin for NixOS: #59023

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

worldofpeace
worldofpeace suggested changes Jul 4, 2019
View reviewed changes
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.

It appears they removed dde-dman-portal

so patching that should be removed and any buildInputs added for it.

  • etc/deepin/greeters.d/00-xrandr

Appears to be a bash script.
Maybe should be wrapped with it's runtime deps in PATH?

  • bin/deepin-greeter

Is a bash script that executes everything in /etc/deepin/greeters.d/.

And weirdly there's deepin/greeters.d/lightdm-deepin-greeter there which just executes bin/lightdm-deepin-greeter
Don't know what that's about but it doesn't make any sense to me 🤣

@romildo
Copy link
Contributor Author

romildo commented Jul 4, 2019

It appears they removed dde-dman-portal

* [linuxdeepin/dde-session-ui@3bd028c](https://github.com/linuxdeepin/dde-session-ui/commit/3bd028cf135ad22c784c0146e447ef34a69af768)

so patching that should be removed and any buildInputs added for it.

Done.

* `etc/deepin/greeters.d/00-xrandr`

Appears to be a bash script.
Maybe should be wrapped with it's runtime deps in PATH?

Replaced xrandr and egrep by their absolute paths in the script.

* `bin/deepin-greeter`

Is a bash script that executes everything in /etc/deepin/greeters.d/.

And weirdly there's deepin/greeters.d/lightdm-deepin-greeter there which just executes bin/lightdm-deepin-greeter
Don't know what that's about but it doesn't make any sense to me rofl

It is not that weird. bin/deepin-greeter runs etc/deepin/greeters.d/lightdm-deepin-greeter, which runs bin/lightdm-deepin-greeter.

But /etc/deepin/greeters.d is still hard coded in bin/deepin-greeter. So it should be replaced by by $out/etc/deepin/greeters.d.

@worldofpeace
Copy link
Contributor

But /etc/deepin/greeters.d is still hard coded in bin/deepin-greeter. So it should be replaced by by $out/etc/deepin/greeters.d.

It appears to be some sort of drop ins system and only used in one other place

Don't think it's actually used though so it should be fine to patch it like that.

@romildo
Copy link
Contributor Author

romildo commented Jul 5, 2019

But /etc/deepin/greeters.d is still hard coded in bin/deepin-greeter. So it should be replaced by by $out/etc/deepin/greeters.d.

It appears to be some sort of drop ins system and only used in one other place

* https://github.com/linuxdeepin/dde-preload/blob/master/dde-preload.pro#L5

Don't think it's actually used though so it should be fine to patch it like that.

Done in previous commit.

worldofpeace
worldofpeace approved these changes Jul 5, 2019
View reviewed changes
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.

LGTM

@romildo
deepin.dde-session-ui: 4.9.11 -> 4.9.12
b0944be 
- Update to version 4.9.12
- Revise hard coded paths
- Wrap binaries in lib/deepin-daemon/
@romildo romildo merged commit d94a4c8 into NixOS:master Jul 5, 2019
@romildo romildo deleted the upd.deepin.dde-session-ui branch July 5, 2019 03:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
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
2 participants
@romildo @worldofpeace