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.qtbase: fix cross #227900

Merged
4 commits merged into from Aug 26, 2023
Merged

qt5.qtbase: fix cross #227900

4 commits merged into from Aug 26, 2023

Commits on Aug 17, 2023

  1. qt-5/modules/qtbase.nix: omit --host and --build configureFlags

    QT's configure script doesn't understand these, so let's not pass them.
    
    Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
    Adam Joseph and SuperSandro2000 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    c9b4998 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. qt5.qtbase: fix cross compilation

    This commit fixes builds of `pkgsCross.*.qt5.qtbase` by:
    
    - Adding the buildPlatform compiler to depsBuildBuild in qtbase.nix
      and qtModule.nix.  The `qtbase` build machinery expects to find it
      in the $PATH in unprefixed form.
    
    - Setting the `PKG_CONFIG_SYSROOT_DIR` and `PKG_CONFIG_LIBDIR`
      environment variables when compiling a cross-targeted `qmake`.
      This is required; if these environment variables are unset,
      `qmake` won't even try to use `pkg-config`.
    
    - Adding the `-device` and `-device-option` flags necessary for
      cross compilation to `configureFlags`.
    
    - Adding the (one-entry at the moment) Rosetta Stone for QT-5 as a
      `let`-defined `qtPlatform` function which takes a nixpkgs platform
      and returns a QT-5 `mkspecs`-string.
    
    Co-authored-by: Christoph Neidahl <christoph.neidahl@gmail.com>
    Adam Joseph and OPNA2608 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    1430b56 View commit details
    Browse the repository at this point in the history
  2. qt5.qtbase: implement @OPNA2608 suggestion

    Adam Joseph committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    f81e02d View commit details
    Browse the repository at this point in the history
  3. Update pkgs/development/libraries/qt-5/modules/qtbase.nix

    Co-authored-by: Christoph Neidahl <christoph.neidahl@gmail.com>
    Adam Joseph and OPNA2608 authored Aug 21, 2023
    Configuration menu
    Copy the full SHA
    ba1dcb2 View commit details
    Browse the repository at this point in the history