qt-5: add buildPackages.stdenv.cc to nativeBuildInputs #220310

ghost · 2023-03-09T09:43:51Z

Description of changes

Because qt-5 uses lib.newScope rather than lib.newScopeWithSplicing, the splicing mechanism for cross compilation does not appear to work correctly.

Rather than risk breakage on native compiles, let's just choose the buildPackages version manually for perl and the host cc (which is needed for qmake). This commit does that by adding them to nativeBuildInputs in qtModule.nix and modules/qtbase.nix.

pkgs/development/libraries/qt-5/modules/qtbase.nix

pkgs/development/libraries/qt-5/qtModule.nix

Artturin · 2023-03-09T18:47:51Z

this isn't related to newScope, instead the issue is that the inherits in all-packages aren't inherited from __splicedPackages

change

qt5 = recurseIntoAttrs (makeOverridable
  (import ../development/libraries/qt-5/5.15) {
    inherit newScope;
    inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
    inherit bison cups dconf harfbuzz libGL perl gtk3 python3;
    inherit (gst_all_1) gstreamer gst-plugins-base;
    inherit darwin;
    inherit buildPackages;
    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
  });

to

  qt5 = recurseIntoAttrs (makeOverridable
    (import ../development/libraries/qt-5/5.15) {
      inherit (__splicedPackages)
        newScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper
        bison cups dconf harfbuzz libGL perl gtk3 python3
        darwin buildPackages;
      inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;
      stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
    });

Artturin · 2023-03-09T19:01:30Z

#220374 inherit __splicedPackages + makeScopeWithSplicing

ghost · 2023-03-09T21:24:22Z

Rebased on top of #220374

This allowed to drop the buildPackages. prefix from perl. The addition of buildPackages.stdenv.cc is still necessary however.

Artturin · 2023-03-09T21:47:11Z

adding buildPackages.stdenv.cc to nativeBuildInputs looks wrong, investigating..

Artturin · 2023-03-09T22:07:08Z

qmake/Makefile (which is generated) has the wrong CC and CXX variables (non prefixed binaries)

also for ref here's the qt5base build file for build root
https://github.com/buildroot/buildroot/blob/master/package/qt5/qt5base/qt5base.mk
i recommend cloning that repository
here's a couple more cross focused repos
https://github.com/openembedded/openembedded-core
https://git.yoctoproject.org/poky

ghost · 2023-03-10T06:29:08Z

qmake/Makefile (which is generated) has the wrong CC and CXX variables (non prefixed binaries)

Is that wrong? qmake runs on the buildPlatform (counterintuitively).

In theory in order to fit nixpkgs way of thinking, qmake ought to be in its own derivation separate from qtbase. But that would be a pretty huge undertaking for a library that is no longer actively developed upstream...

Edit: or we could think of qmake as being a compiler, and give it a targetPlatform (so qmake's (build==host)!=target)

ghost · 2023-03-10T06:36:30Z

i recommend cloning that repository here's a couple more cross focused repos

Void is another good one.

Unfortunately I'm trying to do this without totally rewriting our qt5 expressions. I think the recipes from other distros would be more useful in a rewrite-from-scratch (which I am not volunteering for).

Qmake expects to be able to find the host's C compiler in the $PATH when cross compiling. Let's add it. Co-authored-by: superherointj <[email protected]>

Artturin · 2023-03-10T17:50:40Z

qmake/Makefile (which is generated) has the wrong CC and CXX variables (non prefixed binaries)

Is that wrong? qmake runs on the buildPlatform (counterintuitively).

In theory in order to fit nixpkgs way of thinking, qmake ought to be in its own derivation separate from qtbase. But that would be a pretty huge undertaking for a library that is no longer actively developed upstream...

Edit: or we could think of qmake as being a compiler, and give it a targetPlatform (so qmake's (build==host)!=target)

pkgsCross.aarch64-multiplatform.buildPackages.qt5.qtbase (nativeBuildInputs) already builds, while this is making it possible to build pkgsCross.aarch64-multiplatform.qt5.qtbase(buildInputs) from which binaries won't be run on buildPlatform so using the non-prefixd binaries to build it seems like a bug

adding buildPackages.stdenv.cc to qtModule is especially wrong

even if a build build compiler was needed then buildPackages.stdenv.cc should go in to depsBuildBuild

pkgs/development/libraries/qt-5/5.15/default.nix

SuperSandro2000 · 2023-03-18T15:33:58Z

pkgs/development/libraries/qt-5/modules/qtbase.nix

@@ -77,7 +79,11 @@ stdenv.mkDerivation (finalAttrs: {
    ++ lib.optional (postgresql != null) postgresql;

  nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ]
-    ++ lib.optionals stdenv.isDarwin [ xcbuild ];
+    ++ lib.optionals stdenv.isDarwin [ xcbuild ]
+    # `qtbase` expects to find `cc` (with no prefix) in the


Can we patch that?

Why do we need this in the wrapper and package?

I agree, there's a lot of ugliness in nixpkgs' qt5 expressions. But I am trying really hard not to undertake a rewrite-from-scratch of them here.

pkgs/development/libraries/qt-5/qtModule.nix

Co-authored-by: Sandro <[email protected]>

As recommended here: #220310 (comment) The non-idiomatic `if..then..else null` is to prevent a mass-rebuild sending this to staging. I can submit a separate PR to staging to change it to the `lib.optional` idiom if this bothers people.

ghost · 2023-03-21T02:50:02Z

pkgsCross.aarch64-multiplatform.buildPackages.qt5.qtbase (nativeBuildInputs) already builds, while this is making it possible to build pkgsCross.aarch64-multiplatform.qt5.qtbase(buildInputs) from which binaries won't be run on buildPlatform so using the non-prefixd binaries to build it seems like a bug

I'm having trouble understanding this, except for the last bit about prefixes, which I disagree with: the fact that native compilers are unprefixed is a bug in nixpkgs (which is painful to fix) not a feature.

adding buildPackages.stdenv.cc to qtModule is especially wrong

even if a build build compiler was needed then buildPackages.stdenv.cc should go in to depsBuildBuild

Since qtbase has no meaningful targetPlatform that's a bit of a nitpick, but okay: ceb4d99

ghost requested a review from ttuegel as a code owner March 9, 2023 09:43

github-actions bot added the 6.topic: qt/kde label Mar 9, 2023

ghost mentioned this pull request Mar 9, 2023

qt5 cross compilation #220320

Open

ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Mar 9, 2023

ofborg bot requested review from bkchr, periklis, abbradar, qknight and matthewbauer March 9, 2023 11:24

ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 501-1000 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500 labels Mar 9, 2023

superherointj reviewed Mar 9, 2023

View reviewed changes

pkgs/development/libraries/qt-5/modules/qtbase.nix Outdated Show resolved Hide resolved

superherointj reviewed Mar 9, 2023

View reviewed changes

pkgs/development/libraries/qt-5/qtModule.nix Outdated Show resolved Hide resolved

superherointj mentioned this pull request Mar 9, 2023

qt5.qtwebengine: use python3 (to fix cross) #220318

Closed

ghost marked this pull request as draft March 9, 2023 20:45

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

ghost marked this pull request as ready for review March 9, 2023 21:24

ghost changed the title ~~qt-5: nativeBuildInputs for cross compilation~~ qt-5: add buildPackages.stdenv.cc to nativeBuildInputs Mar 9, 2023

ghost removed request for matthewbauer, qknight, periklis, ttuegel, abbradar and bkchr March 9, 2023 21:26

ghost requested a review from superherointj March 9, 2023 21:26

github-actions bot removed 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS labels Mar 9, 2023

ghost marked this pull request as draft March 10, 2023 05:44

ghost marked this pull request as ready for review March 10, 2023 06:31

qt-5: add buildPackages.stdenv.cc to nativeBuildInputs

cfa4de5

Qmake expects to be able to find the host's C compiler in the $PATH when cross compiling. Let's add it. Co-authored-by: superherointj <[email protected]>

SuperSandro2000 reviewed Mar 18, 2023

View reviewed changes

Adam Joseph and others added 4 commits March 21, 2023 02:37

Update pkgs/development/libraries/qt-5/5.15/default.nix

35e1d46

Co-authored-by: Sandro <[email protected]>

Update pkgs/development/libraries/qt-5/5.15/default.nix

65c3874

Co-authored-by: Sandro <[email protected]>

Update pkgs/development/libraries/qt-5/qtModule.nix

393ab31

Co-authored-by: Sandro <[email protected]>

ghost closed this Apr 24, 2023

ghost deleted the pr/qt5/cross/nativeBuildInputs branch April 24, 2023 02:39

Artturin mentioned this pull request Jan 29, 2024

List of @amjoseph-nixpkgs Pull requests before account removal #284796

Open

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

qt-5: add buildPackages.stdenv.cc to nativeBuildInputs #220310

qt-5: add buildPackages.stdenv.cc to nativeBuildInputs #220310

ghost commented Mar 9, 2023

Artturin commented Mar 9, 2023

Artturin commented Mar 9, 2023

ghost commented Mar 9, 2023

Artturin commented Mar 9, 2023

Artturin commented Mar 9, 2023 •

edited

Loading

ghost commented Mar 10, 2023 •

edited by ghost

Loading

ghost commented Mar 10, 2023 •

edited by ghost

Loading

Artturin commented Mar 10, 2023 •

edited

Loading

SuperSandro2000 Mar 18, 2023

ghost Mar 21, 2023

ghost commented Mar 21, 2023

qt-5: add buildPackages.stdenv.cc to nativeBuildInputs #220310

qt-5: add buildPackages.stdenv.cc to nativeBuildInputs #220310

Conversation

ghost commented Mar 9, 2023

Description of changes

Artturin commented Mar 9, 2023

Artturin commented Mar 9, 2023

ghost commented Mar 9, 2023

Artturin commented Mar 9, 2023

Artturin commented Mar 9, 2023 • edited Loading

ghost commented Mar 10, 2023 • edited by ghost Loading

ghost commented Mar 10, 2023 • edited by ghost Loading

Artturin commented Mar 10, 2023 • edited Loading

SuperSandro2000 Mar 18, 2023

Choose a reason for hiding this comment

ghost Mar 21, 2023

Choose a reason for hiding this comment

ghost commented Mar 21, 2023

Artturin commented Mar 9, 2023 •

edited

Loading

ghost commented Mar 10, 2023 •

edited by ghost

Loading

ghost commented Mar 10, 2023 •

edited by ghost

Loading

Artturin commented Mar 10, 2023 •

edited

Loading