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(library): init at 20.8 #210477

Merged
merged 18 commits into from
Jan 26, 2023
Merged

deepin(library): init at 20.8 #210477

merged 18 commits into from
Jan 26, 2023

Conversation

wineee
Copy link
Member

@wineee wineee commented Jan 13, 2023

Description of changes

I'm trying to port Deepin Desktop Environment to NixOS. Resume work of @romildo and (at)worldofpeace on #94870

I created a flake repository for this work. Porting work nearing completion,I think it's time to request a review.

It will need 70+ commits to add DDE for NixOS, Here is the first part, add all libraries needed for DDE.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions 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/` labels Jan 13, 2023
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Jan 13, 2023
@wineee wineee changed the title Deepin(library): init at 20.8 deepin(library): init at 20.8 Jan 13, 2023
@onny
Copy link
Contributor

onny commented Jan 13, 2023

Result of nixpkgs-review pr 210477 run on x86_64-linux 1

2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
14 packages built:
  • deepin.dde-qt-dbus-factory
  • deepin.deepin-wayland-protocols
  • deepin.disomaster
  • deepin.docparser
  • deepin.dtkcommon
  • deepin.dtkcore
  • deepin.dtkgui
  • deepin.dtkwidget
  • deepin.dwayland
  • deepin.gio-qt
  • deepin.image-editor
  • deepin.qt5integration
  • deepin.qt5platform-plugins
  • deepin.udisks2-qt5

@wineee wineee force-pushed the deepin-lib branch 2 times, most recently from 7c9fad8 to fb4fa4e Compare January 15, 2023 14:40
@wineee wineee force-pushed the deepin-lib branch 2 times, most recently from efd9d17 to c5a9fd6 Compare January 24, 2023 17:54
@wineee
Copy link
Member Author

wineee commented Jan 25, 2023

@ofborg build deepin

Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

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

diff LGTM

Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

LGTM.

Comment on lines +37 to +42
propagatedBuildInputs = [
dtkcore
librsvg
qtimageformats
freeimage
];
Copy link
Member

Choose a reason for hiding this comment

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

Do we really need to do this?

Copy link
Member

Choose a reason for hiding this comment

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

dtkcore is required in dtkgui.pc, not sure about the rest.

Copy link
Member Author

@wineee wineee Jan 27, 2023

Choose a reason for hiding this comment

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

qtimageformats is a runtime dependency,is uesd for parse dci icons (webp format)
image
librsvg is runtime dependency uesd by DSvgRenderer
freeimage is runtime dependency uesd by DImageHandler

Copy link
Member

Choose a reason for hiding this comment

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

This cannot be added via the qt wrapper or another variable?

Copy link
Member Author

Choose a reason for hiding this comment

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

QT_PLUGIN_PATH will be set if qtimageformats in buildInputs and wrapQtAppsHook in nativeBuildInputs
if dont use propagatedBuildInputs, we have to set qtimageformats wrapper for all dtk application

, wrapQtAppsHook
, glibmm
, doxygen
, buildDocs ? false
Copy link
Member

Choose a reason for hiding this comment

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

Whats the reason why this is off by default?

Copy link
Member Author

Choose a reason for hiding this comment

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

fix in #212979

, mtdev
, cairo
, xorg
, waylandSupport ? false
Copy link
Member

Choose a reason for hiding this comment

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

wayland should always be compiled in when possible with x11 at the same time.

Copy link
Member Author

Choose a reason for hiding this comment

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

The adaptation of DDE to wanyland is not complete yet,Arch also disables this option : https://github.com/archlinux/svntogit-community/blob/27fead70b2c5388907ce5ac4eeaf413bfc8f7ffd/trunk/PKGBUILD#L25

Copy link
Member

Choose a reason for hiding this comment

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

Maybe we should add a comment explaining this

Copy link
Member Author

Choose a reason for hiding this comment

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

Should I remove this option and disable wayland compilation directly?

Copy link
Member Author

Choose a reason for hiding this comment

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

By the way, wayland support in deepin may be complete by the end of this year

Copy link
Member

Choose a reason for hiding this comment

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

na, then keep it like it is.

@wineee wineee deleted the deepin-lib branch January 27, 2023 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants