diff options
109 files changed, 225 insertions, 8 deletions
diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index 966af3b2925f..b8b438e88584 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -15,13 +15,14 @@ which are not shared by other C++ software: ```{=docbook} <programlisting> -{ stdenv, lib, qtbase }: <co xml:id='qt-default-nix-co-1' /> +{ stdenv, lib, qtbase, wrapQtAppsHook }: <co xml:id='qt-default-nix-co-1' /> stdenv.mkDerivation { pname = "myapp"; version = "1.0"; buildInputs = [ qtbase ]; + nativeBuildInputs = [ wrapQtAppsHook ]; <co xml:id'qt-default-nix-co-2' /> } </programlisting> @@ -33,6 +34,13 @@ stdenv.mkDerivation { because the Qt versions of dependencies may not be coherent, causing build and runtime failures. </para> </callout> + <callout arearefs="qt-default-nix-co-2'> + <para> + All Qt packages must include <literal>wrapQtAppsHook</literal> in + <literal>nativeBuildInputs</literal>, or you must explicitly set + <literal>dontWrapQtApps</literal>. + </para> + </callout> </calloutlist> ``` @@ -50,7 +58,8 @@ stdenv.mkDerivation { } ``` -Add entries to `qtWrapperArgs` are to modify the wrappers created by `wrapQtAppsHook`: +Add entries to `qtWrapperArgs` are to modify the wrappers created by +`wrapQtAppsHook`: ```nix { stdenv, wrapQtAppsHook }: @@ -65,7 +74,8 @@ stdenv.mkDerivation { The entries are passed as arguments to [wrapProgram](#fun-wrapProgram). Set `dontWrapQtApps` to stop applications from being wrapped automatically. -Wrap programs manually with `wrapQtApp`, using the syntax of [wrapProgram](#fun-wrapProgram): +Wrap programs manually with `wrapQtApp`, using the syntax of +[wrapProgram](#fun-wrapProgram): ```nix { stdenv, lib, wrapQtAppsHook }: diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index ba9df9039f6c..953a919d0c70 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { "SHARE_DIR=${placeholder "out"}/share" ]; + dontWrapQtApps = true; + meta = with lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 187d3a58b171..261a33e8c6e5 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { --replace "\$\$[QT_INSTALL_PREFIX]" "$out" ''; + dontWrapQtApps = true; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index ca8df45e459e..02353fcf4f51 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib drumstick qtbase qtsvg ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://kmetronome.sourceforge.io/"; description = "ALSA MIDI metronome with Qt interface"; diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix index b1b60540b8c2..11424c0be181 100644 --- a/pkgs/applications/audio/nootka/default.nix +++ b/pkgs/applications/audio/nootka/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation |