diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-04-23 17:13:19 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-08-20 21:41:19 -0700 |
| commit | 1430b56362a4719e807568dc38c9b060b118f063 (patch) | |
| tree | 1bfbdf093c0efd4bb1154fd4e083542f1b21d297 /pkgs/development/libraries/qt-5/5.15 | |
| parent | c9b4998cc9545fa9f968ec29a8a05350dc0e2ed4 (diff) | |
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>
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.15')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 16be29ad529e8..6ed5f2b0b1b6d 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -207,7 +207,8 @@ let import ../qtModule.nix { inherit perl; - inherit lib; + inherit lib stdenv; + inherit buildPackages; # Use a variant of mkDerivation that does not include wrapQtApplications # to avoid cyclic dependencies between Qt modules. mkDerivation = |