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.

Sign up for GitHub

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

Jump to bottom

qt5: fix splicing #264903

Merged
merged 2 commits into from
Nov 3, 2023
Merged

qt5: fix splicing #264903

merged 2 commits into from
Nov 3, 2023

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Nov 1, 2023

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.

@Artturin
qt5: fix splicing
19e0474 
and simplify some things

remove now unnecessary use of buildPackages
@Artturin
qt5: remove with self;
bd02bf1 
The `self` does not contain spliced packages, callPackage works
properly.
@Artturin Artturin mentioned this pull request Nov 1, 2023
Draft
12 tasks
@ghost ghost self-assigned this Nov 2, 2023
@ghost
Copy link

ghost commented Nov 2, 2023

Working on testing this.

Here is the qt6 version: #264959

@ghost
Copy link

ghost commented Nov 2, 2023

I'll try to rebase #264965 on this

@ghost ghost mentioned this pull request Nov 3, 2023
Merged
13 tasks
@Artturin
Copy link
Member Author

Artturin commented Nov 3, 2023

This reduces the amount of derivations to build after building all the succeeding ones

nix build ".#pkgsCross.aarch64-multiplatform.qt5.qt3d" --keep-going

these 14 derivations will be built:
  /nix/store/jk3dv2r7c750949k8l5k40l7qgavqbyq-qttranslations-5.15.10.drv
  /nix/store/789zvlpcdl5gjdzzmw0j4izin9v6jp9c-qtbase-5.15.10.drv
  /nix/store/niag4vfnhpmdlms6sfqs9mj0444c5q0g-qmake-hook.drv
  /nix/store/v9svbj6mhmq5xr7hims7jwd84ilhh2cn-qtsvg-5.15.10.drv
  /nix/store/k9nd4ls8ajsvza6y1rh8gxh69k3xgkgl-qtdeclarative-5.15.10.drv
  /nix/store/qdl8pwnygkwygrimbwzr71x5b56lqwcd-qttools-5.15.10.drv
  /nix/store/79ci43i5jpwd4igk3wzxjlr6awn6n4dg-qtbase-aarch64-unknown-linux-gnu-5.15.10.drv
  /nix/store/r9dk0rq6wr48ijv2vq6r1vg5mb9varxv-qmake-hook.drv
  /nix/store/8v9z215v19j1x0fal0116xjpd8addhlh-qttranslations-aarch64-unknown-linux-gnu-5.15.10.drv
  /nix/store/9p4dgv9179mxfb4gd713v58g93c0dcc5-qtbase-aarch64-unknown-linux-gnu-5.15.10.drv
  /nix/store/fb8dbral8x8hdqrdnylmybxvkcsyzkip-qmake-hook.drv
  /nix/store/60g2ws7qgcfjj65bcvgn8xlrnlsrs9xq-qtsvg-aarch64-unknown-linux-gnu-5.15.10.drv
  /nix/store/lhgxqvx5xsgdzh8apbdiq8zdj4lvpzah-qtdeclarative-aarch64-unknown-linux-gnu-5.15.10.drv
  /nix/store/fag3a6ldrqdr47vhra583c5cyms5ax60-qt3d-aarch64-unknown-linux-gnu-5.15.10.drv

these 8 derivations will be built:
  /nix/store/m5lsbhw0796r9p35zfva78sbg7z3am31-qtsvg-5.15.10.drv
  /nix/store/41jg69xbvnvdyn1ayh80alqzy8nznb4l-qtdeclarative-5.15.10.drv
  /nix/store/wdg936p947wd4gx87pn1arqxk74p38sw-qttools-5.15.10.drv
  /nix/store/2k3dwsza8rv8ilasaxbfr1ar2mmgfrs2-qttranslations-aarch64-unknown-linux-gnu-5.15.10.drv
  /nix/store/pwzf1pwq1h43bq720dmxfng8g663h29v-qtbase-aarch64-unknown-linux-gnu-5.15.10.drv
  /nix/store/df1h97nqhdkfw4ns75hq4grjkqwg5n1a-qtsvg-aarch64-unknown-linux-gnu-5.15.10.drv
  /nix/store/kbmxzwbc9xm8c2x4q7vaw2yzv9z4jd6k-qtdeclarative-aarch64-unknown-linux-gnu-5.15.10.drv
  /nix/store/c2sxcimrl9nxaw4jncxll2sh0fg3lb3c-qt3d-aarch64-unknown-linux-gnu-5.15.10.drv

14 vs 8

ghost
ghost approved these changes Nov 3, 2023
View reviewed changes
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.

We should merge this soon.

@Artturin
Copy link
Member Author

Artturin commented Nov 3, 2023

pkgsCross.aarch64-multiplatform.qt5.full
41 failed to 35 failed

@Artturin Artturin merged commit b65f481 into NixOS:master Nov 3, 2023
19 checks passed
@Artturin Artturin deleted the splitqt1 branch November 3, 2023 02:57
@ghost
Copy link

ghost commented Nov 3, 2023

I have the fix. There was a rebase issue with the path to meson's emulator-hook.sh which got moved into pkgs/by-name.

@ghost
Copy link

ghost commented Nov 3, 2023

#265134

This was referenced Nov 3, 2023
Merged
Closed
ghost
ghost reviewed Nov 9, 2023
View reviewed changes
pkgs/development/libraries/qt-5/5.15/default.nix
propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeBinaryWrapper ]
++ lib.optional stdenv.isLinux self.qtwayland.dev;
} ../hooks/wrap-qt-apps-hook.sh;
propagatedBuildInputs = [ qtbase.dev makeBinaryWrapper ]
Copy link

Choose a reason for hiding this comment

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

Something still isn't right here.

@Artturin Artturin added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Nov 22, 2023
This was referenced Nov 22, 2023
Merged
Open
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

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: qt/kde 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@Artturin