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

deepin.startdde: init at 5.0.1 #63813

Merged
merged 6 commits into from Jan 8, 2020
Merged

Conversation

@romildo
Copy link
Contributor

@romildo romildo commented Jun 26, 2019

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.
@romildo romildo requested a review from worldofpeace Jun 26, 2019
@romildo
Copy link
Contributor Author

@romildo 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

Copy link
Member

@worldofpeace worldofpeace left a comment

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)

pkgs/desktops/deepin/startdde/default.nix Outdated Show resolved Hide resolved
pkgs/desktops/deepin/startdde/default.nix Outdated Show resolved Hide resolved

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

environment.systemPackages = with pkgs; [

This comment has been minimized.

@worldofpeace

worldofpeace Jul 7, 2019
Member

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 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
Copy link
Member

@worldofpeace worldofpeace commented Jul 22, 2019

Two other commits for you @romildo

Could you also rebase?

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Aug 5, 2019

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 romildo force-pushed the romildo:upd.deepin.startdde branch from 63013a8 to fc18d94 Aug 8, 2019
@romildo
Copy link
Contributor Author

@romildo 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
Member

@worldofpeace worldofpeace 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?

@romildo
Copy link
Contributor Author

@romildo 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
Member

@worldofpeace worldofpeace 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 👍

@romildo
Copy link
Contributor Author

@romildo 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
Member

@worldofpeace worldofpeace commented Aug 8, 2019

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

@romildo romildo force-pushed the romildo:upd.deepin.startdde branch from 6a1fbd9 to 82c33e3 Aug 9, 2019
@romildo
Copy link
Contributor Author

@romildo romildo commented Aug 9, 2019

Rebased.

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Aug 9, 2019

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.

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Aug 11, 2019

d080461..d64bb6d 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 worldofpeace force-pushed the romildo:upd.deepin.startdde branch from 8d8423a to a45d90e Oct 22, 2019
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Oct 22, 2019

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 Nov 20, 2019
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Nov 22, 2019

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
57 of 76 tasks complete
@romildo romildo force-pushed the romildo:upd.deepin.startdde branch from c768344 to 84718a1 Dec 31, 2019
@romildo romildo force-pushed the romildo:upd.deepin.startdde branch from 84718a1 to 2681adc Dec 31, 2019
@romildo
Copy link
Contributor Author

@romildo romildo commented Dec 31, 2019

Resolved two conflicts with the base branch.

@worldofpeace worldofpeace mentioned this pull request Jan 8, 2020
0 of 10 tasks complete
romildo and others added 6 commits Nov 12, 2018
Forgot about wrapQtAppsHook only wrapping
binaries that are ELF headers. So it can't wrap
it if it already is.
Forgot about wrapQtAppsHook only wrapping
binaries that are ELF headers. So it can't wrap
it if it already is.
Forgot about wrapQtAppsHook only wrapping
binaries that are ELF headers. So it can't wrap
it if it already is.
Forgot about wrapQtAppsHook only wrapping
binaries that are ELF headers. So it can't wrap
it if it already is.
Forgot about wrapQtAppsHook only wrapping
binaries that are ELF headers. So it can't wrap
it if it already is.
@worldofpeace worldofpeace force-pushed the romildo:upd.deepin.startdde branch from bf05638 to 02543ef Jan 8, 2020
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Jan 8, 2020

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.

@worldofpeace worldofpeace merged commit 794780d into NixOS:master Jan 8, 2020
16 checks passed
16 checks passed
deepin.dde-control-center, deepin.dde-dock, deepin.dde-file-manager, deepin.dde-launcher, deepin.dde-session-ui, deepin.startdde on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
deepin.dde-control-center, deepin.dde-dock, deepin.dde-file-manager, deepin.dde-launcher, deepin.dde-session-ui, deepin.startdde on aarch64-linux Success
Details
deepin.dde-control-center, deepin.dde-dock, deepin.dde-file-manager, deepin.dde-launcher, deepin.dde-session-ui, deepin.startdde on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@romildo romildo deleted the romildo:upd.deepin.startdde branch Jan 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.