Skip to content

libsForQt5: fix using `pkgsCross.aarch64-multiplatform.pkgsBuildTarge…#267323

Merged
Artturin merged 1 commit intoNixOS:masterfrom
Artturin:qt5presplicefix
Nov 14, 2023
Merged

libsForQt5: fix using `pkgsCross.aarch64-multiplatform.pkgsBuildTarge…#267323
Artturin merged 1 commit intoNixOS:masterfrom
Artturin:qt5presplicefix

Conversation

@Artturin
Copy link
Member

…t.targetPackages.libsForQt5.qtbase` explicitly

without splicing interfering

in, for example, nativeBuildInputs.

Description of changes

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/)
  • 23.11 Release Notes (or backporting 23.05 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.

…t.targetPackages.libsForQt5.qtbase` explicitly

without splicing interfering

in, for example, `nativeBuildInputs`.
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 14, 2023
@Artturin Artturin merged commit e72e6a8 into NixOS:master Nov 14, 2023
@Artturin Artturin deleted the qt5presplicefix branch November 14, 2023 13:55
@eryngion
Copy link

Ugh. This breaks splicing for me in context of #267311. I get

these 12 derivations will be built:
  /nix/store/1h7xrwmani4j6xfl6q2jq3c153105agh-wrap-qt5-apps-hook.drv
  /nix/store/3rl93xqmpkd8ckns32hssh41gp84170k-qtwebchannel-5.15.10.drv
  /nix/store/a9f9sscsf9606l24agzlbrj5qxzcvmy2-qtx11extras-5.15.10.drv
  /nix/store/pa7kmvp0zi2dkzn225z9byq0vasdkj3s-qtmultimedia-5.15.10.drv
  /nix/store/sll8wswvfnc9xv774ayz9iqj9fcxgwyj-qtlocation-5.15.10.drv
  /nix/store/y6wzvabl844pcsnfcw5pwvrzjyhf4r31-qtsensors-5.15.10.drv
  /nix/store/i0vgnq5x7zvr3gc000d1iyrh3wvbwymk-qtwebkit-5.212.0-alpha4.drv
  /nix/store/n44cbggvv24gynpny8wsk9frafncw9yw-qttools-5.15.10.drv
  /nix/store/7kdlzgrgdi3v3hhk26yhmdpvdvq9m06l-goldendict-aarch64-unknown-linux-gnu-1.5.0.drv

Instead of

these 5 derivations will be built:
  /nix/store/3hmsnj0rvbv9jmh8r9srhzkvw8gimcy1-qttools-aarch64-unknown-linux-gnu-5.15.10.drv
  /nix/store/i9mgvr7ghz0d0g6m94jppwm4rxz2m00f-goldendict-aarch64-unknown-linux-gnu-1.5.0.drv

@Artturin
Copy link
Member Author

Artturin commented Nov 14, 2023

passthru = { inherit wrapQtAppsHook qtbase; }; in goldendict

the attributes have __spliced but they're one step too early in the sliding window (something lke that)

nix-repl> pkgsCross.aarch64-multiplatform.goldendict.wrapQtAppsHook.__spliced.hostTarget.stdenv.hostPlatform.system
"x86_64-linux"

nix-repl> pkgsCross.aarch64-multiplatform.goldendict.wrapQtAppsHook.__spliced.hostTarget.stdenv.targetPlatform.system
"aarch64-linux"

Those both should be aarch64-linux

with passthru = { inherit (__splicedPackages.qt5) wrapQtAppsHook qtbase; }; they're both aarch64-linux

# qt5 set should not be pre-spliced to prevent spliced packages being a part of an unspliced set
# 'pkgsCross.aarch64-multiplatform.pkgsBuildTarget.targetPackages.libsForQt5.qtbase' should not have a `__spliced` but if qt5 is pre-spliced then it will have one.
# pkgsBuildHost == pkgs
qt5 = pkgsBuildHost.qt5;
Copy link
Member Author

Choose a reason for hiding this comment

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

Used pkgsBuildHost here while i should have used pkgsHostTarget

Copy link
Member Author

Choose a reason for hiding this comment

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

Choose a reason for hiding this comment

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

Yep, that does it.

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

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants