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.dtk6: init #310305

Merged
merged 5 commits into from
May 14, 2024
Merged

deepin.dtk6: init #310305

merged 5 commits into from
May 14, 2024

Conversation

wineee
Copy link
Member

@wineee wineee commented May 9, 2024

Description of changes

close: #296102

The basic development library of deepin desktop environment build on qt 6

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@wineee wineee changed the title Dtk6 qt6 deepin.dtk6: init May 9, 2024
@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: 1-10 labels May 9, 2024
@wineee wineee requested review from SuperSandro2000 and NickCao May 10, 2024 01:35
@wineee wineee merged commit fc3229d into NixOS:master May 14, 2024
43 of 47 checks passed
@wineee wineee deleted the dtk6-qt6 branch May 14, 2024 05:53
@SuperSandro2000
Copy link
Member

we should try to upstream the patches

@wineee
Copy link
Member Author

wineee commented May 15, 2024

we should try to upstream the patches

Fix build for qt 6.7 has already merged linuxdeepin/dtkwidget#570

But there are some obstacles to upstream patches for cmake path:
only on NixOS CMAKE_INSTALL_LIBDIR is an absolute path, these patches will cause the prefix (generally /usr) to be missing on other distribution.
I used '-DCMAKE_INSTALL_LIBDIR=lib' before, but it doesn't work for multiple-outputs,this makes CMAKE_INSTALL_PREFIX no longer reliable, includedir and libdir have different PREFIX

@SuperSandro2000
Copy link
Member

only on NixOS CMAKE_INSTALL_LIBDIR is an absolute path, these patches will cause the prefix (generally /usr) to be missing on other distribution.

NixOS often exposes errors in cmake usages where the variables are used incorrectly because we rely on install dir and install prefix.

I used '-DCMAKE_INSTALL_LIBDIR=lib' before, but it doesn't work for multiple-outputs,this makes CMAKE_INSTALL_PREFIX no longer reliable, includedir and libdir have different PREFIX

Then there is likely another issue somewhere else because that is a fix we usually use.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

2 participants