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: use depsTargetTargetPropagated for self.qtbase.dev #227901

Closed
wants to merge 4 commits into from
Closed

qt5: use depsTargetTargetPropagated for self.qtbase.dev #227901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e197fe
qt5.wrapQtAppsHook: move libs to depsTargetTargetPropagated
Artturin Mar 10, 2023
e5f16cf
frescobaldi: fix
Artturin Mar 15, 2023
8272a6b
qtbase: fix cross
Apr 24, 2023
7988fc9
qt5: use depsTargetTargetPropagated for self.qtbase.dev
Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkgs/development/libraries/qt-5/5.15/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ let
{
inherit perl;
inherit lib;
inherit buildPackages;
# Use a variant of mkDerivation that does not include wrapQtApplications
# to avoid cyclic dependencies between Qt modules.
mkDerivation =
Expand Down Expand Up @@ -317,7 +318,7 @@ let

qmake = makeSetupHook {
name = "qmake-hook";
propagatedBuildInputs = [ self.qtbase.dev ];
depsTargetTargetPropagated = [ self.qtbase.dev ];
substitutions = {
inherit debug;
fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh;
Expand All @@ -326,7 +327,8 @@ let

wrapQtAppsHook = makeSetupHook {
name = "wrap-qt5-apps-hook";
propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeBinaryWrapper ]
propagatedBuildInputs = [ buildPackages.makeBinaryWrapper ];
depsTargetTargetPropagated = [ self.qtbase.dev ]
++ lib.optional stdenv.isLinux self.qtwayland.dev;
} ../hooks/wrap-qt-apps-hook.sh;
} // lib.optionalAttrs config.allowAliases {
Expand Down
6 changes: 6 additions & 0 deletions pkgs/development/libraries/qt-5/modules/qtbase.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
, developerBuild ? false
, decryptSslTraffic ? false
, testers
, buildPackages
}:

let
Expand Down Expand Up @@ -82,6 +83,11 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ]
++ lib.optionals stdenv.isDarwin [ xcbuild ];

# `qtbase` expects to find `cc` (with no prefix) in the
# `$PATH`, so the following is needed even if
# `stdenv.buildPlatform.canExecute stdenv.hostPlatform`
depsBuildBuild = [ buildPackages.stdenv.cc ];

propagatedNativeBuildInputs = [ lndir ];

enableParallelBuilding = true;
Expand Down
8 changes: 6 additions & 2 deletions pkgs/development/libraries/qt-5/qtModule.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ lib, mkDerivation, perl }:
{ lib, mkDerivation, perl
, buildPackages
}:

let inherit (lib) licenses maintainers platforms; in

Expand All @@ -16,8 +18,10 @@ mkDerivation (args // {
inherit pname version src;
patches = (args.patches or []) ++ (patches.${pname} or []);

nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ];
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake self.qtbase.dev ];

propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
depsBuildBuild = [ buildPackages.stdenv.cc ];

outputs = args.outputs or [ "out" "dev" ];
setOutputFlags = args.setOutputFlags or false;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/misc/frescobaldi/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }:
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond, gettext }:

buildPythonApplication rec {
pname = "frescobaldi";
Expand All @@ -22,7 +22,7 @@ buildPythonApplication rec {
pyqtwebengine
];

nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook gettext ];

# Needed because source is fetched from git
preBuild = ''
Expand Down