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

qt5: inherit from __splicedPackages to fix cross #220374

Merged
merged 2 commits into from
Mar 9, 2023

Conversation

Artturin
Copy link
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.

if there is more than one qt5 attr and this file is copied then the arg
to generateSplicesForMkScope should be changed
Copy link

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

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
Member Author

Artturin commented Mar 18, 2023

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
Member

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
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
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants