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.

Sign up for GitHub

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.startdde: init at 5.0.1 #63813

Merged
merged 6 commits into from
Jan 8, 2020
Merged

deepin.startdde: init at 5.0.1 #63813

merged 6 commits into from
Jan 8, 2020
+213 −6

Conversation

romildo
Copy link
Contributor

@romildo romildo commented Jun 26, 2019 •
edited
Loading

Motivation for this change

  • Add startdde, used for launching DDE components and invoking user's custom applications which are compliant with xdg autostart specification.

  • Add the nixos desktop service module.

The packaging of Deepin Desktop Environment is alpha quality at this point. But at least it should be possible to run DDE for testing and bug fix purposes.

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.

Sorry, something went wrong.

@romildo romildo requested a review from worldofpeace June 26, 2019 14:33
@romildo
Copy link
Contributor Author

romildo commented Jun 26, 2019

Screenshot from 2019-06-26 11-14-47
Screenshot from 2019-06-26 11-15-25
Screenshot from 2019-06-26 11-19-41

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jun 26, 2019
worldofpeace
worldofpeace suggested changes Jul 7, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I have a commit you should probably integrate here worldofpeace@53568a5.
This enables more services that are needed and uses an upstream session, etc.

Also think we should get a module for the greeter here while we're at it worldofpeace@8314f03 (wip)

nixos/modules/services/x11/desktop-managers/deepin.nix Outdated

fonts.fonts = with pkgs; [ noto-fonts ];

environment.systemPackages = with pkgs; [
Copy link
Contributor

Choose a reason for hiding this comment

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

We're going to need to get this to work without libraries in systemPackages.

@worldofpeace worldofpeace self-assigned this Jul 7, 2019
@romildo
Copy link
Contributor Author

romildo commented Jul 7, 2019

I have a commit you should probably integrate here worldofpeace@53568a5.
This enables more services that are needed and uses an upstream session, etc.

Added.

Also think we should get a module for the greeter here while we're at it worldofpeace@8314f03 (wip)

Added.

@worldofpeace worldofpeace mentioned this pull request Jul 22, 2019
Merged
10 tasks
@worldofpeace
Copy link
Contributor

Two other commits for you @romildo

Could you also rebase?

@worldofpeace
Copy link
Contributor

ping @romildo.

I think we can integrate this after figuring out the default font names for deepin 🤞
After that I plan to write a simple test.

@romildo
Copy link
Contributor Author

romildo commented Aug 8, 2019

Two other commits for you @romildo

* [worldofpeace@310f076](https://github.com/worldofpeace/nixpkgs/commit/310f0764f6f02062d13478deec715af00975164d)
  fixes build

* [worldofpeace@d1a7152](https://github.com/worldofpeace/nixpkgs/commit/d1a7152c03ba8745479d2a66f798ea724f990957)
  integrate after #65248 is on master

Could you also rebase?

Done.

I had to set an older version for vala to build deepin-wm due to compilation errors with the latest version.

Sorry for the delay. I am in vacations (first time in Europe).

@worldofpeace
Copy link
Contributor

Sorry for the delay. I am in vacations (first time in Europe).

In that case can you make your branch writable to maintainers?

@romildo
Copy link
Contributor Author

romildo commented Aug 8, 2019

Sorry for the delay. I am in vacations (first time in Europe).

In that case can you make your branch writable to maintainers?

It is already marked as writable to maintainers.

@worldofpeace
Copy link
Contributor

Sorry for the delay. I am in vacations (first time in Europe).

In that case can you make your branch writable to maintainers?

It is already marked as writable to maintainers.

Weird, last time I tried to push it was rejected.
Guess it's good now though 👍

@romildo
Copy link
Contributor Author

romildo commented Aug 8, 2019

Sorry for the delay. I am in vacations (first time in Europe).

In that case can you make your branch writable to maintainers?

It is already marked as writable to maintainers.

Weird, last time I tried to push it was rejected.
Guess it's good now though +1

It is marked here:

Screenshot from 2019-08-08 10-37-39

Should I do anything else?

@worldofpeace
Copy link
Contributor

Yeah that's all you have to do @romildo, thanks.

@romildo
Copy link
Contributor Author

romildo commented Aug 9, 2019

Rebased.

@worldofpeace
Copy link
Contributor

I noticed that I need to adjust the wrapping of these things more, and the addition of wrapQtAppsHook has added an interesting theming issue. We probably need to re-add a library to systemPackages.

I have stuff locally for the wrappers though.

@ofborg ofborg bot added the 8.has: documentation This PR adds or changes documentation label Aug 11, 2019
@worldofpeace
Copy link
Contributor

d080461209327a8660e0af8891264e1db52dc145..d64bb6d2d337338234d31f4ed9696c9140278bd6 fixed the aforementioned issue.

Though there is an issue with usability:
Screenshot from 2019-08-11 14 58 05

Certain applications don't get their respective icons in dde-launcher.
I'm not expecting that logic to be implemented in that software though (lower in deepin).

Other than this I think I'll give this a boot entry on my machine to test it further.

@worldofpeace
Copy link
Contributor

I think it's possible the aforementioned issue is fixed with the new PAM env.
Additionally deepin has deprecated deepin-wm and now uses kwin. So any issues that bamf currently had will go away with the switch to kwin.

However deepin-wm is broken currently... and no fix in sight so I can't merge atm.
Will open a PR trying to package deepin's kwin though.

@romildo romildo changed the title deepin.startdde: init at 3.14.6.4 deepin.startdde: init at 5.0.1 Nov 20, 2019
@ofborg ofborg bot requested review from ehmry and worldofpeace November 20, 2019 10:10
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Nov 20, 2019
@worldofpeace
Copy link
Contributor

Ok, so I did try this locally with dde-kwin and it just starts up with a white screen. Need to investigate further.

@worldofpeace worldofpeace mentioned this pull request Dec 1, 2019
Closed
76 tasks
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 31, 2019
@romildo
Copy link
Contributor Author

romildo commented Dec 31, 2019

Resolved two conflicts with the base branch.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 31, 2019
@worldofpeace worldofpeace mentioned this pull request Jan 8, 2020
Closed
10 tasks
romildo and others added 6 commits January 7, 2020 20:13
@romildo @worldofpeace
deepin.startdde: init at 5.0.1
ee7041c
@worldofpeace
deepin.dde-control-center: use gapps wrapper
ff72e1d 
Forgot about wrapQtAppsHook only wrapping
binaries that are ELF headers. So it can't wrap
it if it already is.
@worldofpeace
deepin.dde-dock: use gapps wrapper
2fe9525 
Forgot about wrapQtAppsHook only wrapping
binaries that are ELF headers. So it can't wrap
it if it already is.
@worldofpeace
deepin.dde-file-manager: use gapps wrapper
f4e0ae2 
Forgot about wrapQtAppsHook only wrapping
binaries that are ELF headers. So it can't wrap
it if it already is.
@worldofpeace
deepin.dde-launcher: use gapps wrapper
6209562 
Forgot about wrapQtAppsHook only wrapping
binaries that are ELF headers. So it can't wrap
it if it already is.
@worldofpeace
deepin.dde-session-ui: use gapps wrapper
02543ef 
Forgot about wrapQtAppsHook only wrapping
binaries that are ELF headers. So it can't wrap
it if it already is.
@worldofpeace
Copy link
Contributor

I've moved the modules into #77293 so we can integrate this and get one small step closer. Will merge after eval succeeds.

Here's the diff of what was dropped from this PR

and I had to rewrite two commits into #77293 so anything here didn't touch the modules.

@ofborg ofborg bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 8, 2020
@worldofpeace worldofpeace merged commit 794780d into NixOS:master Jan 8, 2020
@romildo romildo deleted the upd.deepin.startdde branch January 8, 2020 09:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehmry ehmry

@worldofpeace worldofpeace

Assignees

@worldofpeace worldofpeace

Labels
8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@romildo @worldofpeace