Skip to content

qt5: inherit from __splicedPackages to fix cross#220374

Merged
Artturin merged 2 commits intoNixOS:masterfrom
Artturin:qt5splicing
Mar 9, 2023
Merged

qt5: inherit from __splicedPackages to fix cross#220374
Artturin merged 2 commits intoNixOS:masterfrom
Artturin:qt5splicing

Conversation

@Artturin
Copy link
Copy Markdown
Member

@Artturin Artturin commented Mar 9, 2023

Description of changes
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
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Mar 9, 2023
@github-actions github-actions bot added the 6.topic: qt/kde Object-oriented framework for GUI creation label Mar 9, 2023
@Artturin Artturin mentioned this pull request Mar 9, 2023
Closed
@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 Mar 9, 2023
@Artturin
qt5: use makeScopeWithSplicing
2cbbef0 
if there is more than one qt5 attr and this file is copied then the arg
to generateSplicesForMkScope should be changed
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 9, 2023
@Artturin Artturin mentioned this pull request Mar 9, 2023
Closed
@Artturin Artturin marked this pull request as ready for review March 9, 2023 20:58
@Artturin Artturin requested a review from ttuegel as a code owner March 9, 2023 20:58
This was referenced Mar 9, 2023
Open
Closed
ghost
ghost approved these changes Mar 9, 2023
View reviewed changes
Copy link
Copy Markdown

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Thank you so much for this. The splicing voodoo is still a total mystery to me. I read the comments in splice.nix four or five times and still can't figure out what's going on there.

@Artturin Artturin merged commit eec92af into NixOS:master Mar 9, 2023
@Artturin Artturin deleted the qt5splicing branch March 9, 2023 21:26
@SuperSandro2000
Copy link
Copy Markdown
Member

SuperSandro2000 commented Mar 18, 2023

The following overlay now causes an infinite recursion

  plasma5Packages = prev.plasma5Packages.overrideScope (final2: prev2: {
    okular = prev2.okular.override { withSpeech = false; };

    plasma-workspace = prev2.plasma-workspace.overrideAttrs (oldAttrs: {
      buildInputs = oldAttrs.buildInputs or [ ] ++ (with prev2; [ qtimageformats ]);
    });
  });

I only changed overrideScope' to overrideScope after seeing the warning and thought that is unexpected.

@Artturin
Copy link
Copy Markdown
Member Author

Artturin commented Mar 18, 2023 •
edited
Loading

plasma5Packages is a different set and different file and it doesn't use makeScopeWithSplicing so the overrideScope you're using is the deprecated overrideScope which has the arguments flipped and thats why you're getting the infinite recursion

you shouldn't be getting any of the warnings introduced in this PR

@SuperSandro2000
Copy link
Copy Markdown
Member

SuperSandro2000 commented Mar 19, 2023

plasma5Packages is more or less just an alias for libsForQt5.

  # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
  plasma5Packages = libsForQt5;

I don't get the warning right now anymore but I forgot which shenanigans I did to get it.

@Izorkin
Copy link
Copy Markdown
Contributor

Izorkin commented May 1, 2023

@Artturin this change may cause murmur to rebuild QT5 unnecessarily again if set to environment.noXlibs = true;?

@Artturin
Copy link
Copy Markdown
Member Author

Artturin commented May 1, 2023

@Artturin this change may cause murmur to rebuild QT5 unnecessarily again if set to environment.noXlibs = true;?

it shouldn't

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ttuegel ttuegel Awaiting requested review from ttuegel

1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: qt/kde Object-oriented framework for GUI creation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Artturin @SuperSandro2000 @Izorkin