JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtbase: Check for wrapQtAppsHook in setupHook

Browse Source
This commit is contained in:
Thomas Tuegel 2021-01-12 05:50:23 -06:00
parent 67b7cffaec
commit 5590e365e4
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
109 changed files with 225 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/languages-frameworks/qt.section.md
View File

@ -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 }:

2
pkgs/applications/audio/csound/csound-qt/default.nix
View File

@ -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/";

2
pkgs/applications/audio/keyfinder/default.nix
View File

@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
--replace "\$\$[QT_INSTALL_PREFIX]" "$out"
'';
dontWrapQtApps = true;
enableParallelBuilding = true;
meta = with lib; {

2
pkgs/applications/audio/kmetronome/default.nix
View File

@ -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";

2
pkgs/applications/audio/nootka/default.nix
View File

@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
"-DENABLE_PULSEAUDIO=ON"
];
dontWrapQtApps = true;
meta = with lib; {
description = "Application for practicing playing musical scores and ear training";
homepage = "https://nootka.sourceforge.io/";

2
pkgs/applications/audio/nootka/unstable.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
qtbase qtdeclarative qtquickcontrols2
];
dontWrapQtApps = true;
cmakeFlags = [
"-DCMAKE_INCLUDE_PATH=${libjack2}/include/jack;${libpulseaudio.dev}/include/pulse"
"-DENABLE_JACK=ON"

1
pkgs/applications/audio/ocenaudio/default.nix
View File

@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
dontUnpack = true;
dontBuild = true;
dontStrip = true;
dontWrapQtApps = true;
installPhase = ''
mkdir -p $out

2
pkgs/applications/audio/playbar2/default.nix
View File

@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
kwindowsystem
];
dontWrapQtApps = true;
meta = with lib; {
description = "Mpris2 Client for Plasma5";
homepage = "https://github.com/audoban/PlayBar2";

2
pkgs/applications/audio/seq66/default.nix
View File

@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://github.com/ahlstromcj/seq66";
description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64";

2
pkgs/applications/audio/spectmorph/default.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
dontWrapQtApps = true;
meta = with lib; {
description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds";
homepage = "http://spectmorph.org";

2
pkgs/applications/blockchains/bitcoin-classic.nix
View File

@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
dontWrapQtApps = true;
meta = {
description = "Peer-to-peer electronic cash system (Classic client)";
longDescription= ''

2
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -101,6 +101,8 @@ stdenv.mkDerivation rec {
})
];
dontWrapQtApps = true;
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
configureFlags = [

3
pkgs/applications/editors/code-browser/default.nix
View File

@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
]
++ lib.optionals withQt [ "UI=qt" ]
++ lib.optionals withGtk [ "UI=gtk" ];
dontWrapQtApps = true;
meta = with lib; {
description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code";
homepage = "https://tibleiz.net/code-browser/";

2
pkgs/applications/editors/kdevelop5/kdev-php.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ];
dontWrapQtApps = true;
meta = with lib; {
maintainers = [ maintainers.aanderse ];
platforms = platforms.linux;

2
pkgs/applications/editors/kdevelop5/kdev-python.nix
View File

@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ threadweaver ktexteditor kdevelop-unwrapped ];
dontWrapQtApps = true;
meta = with lib; {
maintainers = [ maintainers.aanderse ];
platforms = platforms.linux;

2
pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase ];
dontWrapQtApps = true;
meta = with lib; {
maintainers = [ maintainers.ambrop72 ];
platforms = platforms.linux;

2
pkgs/applications/editors/qxmledit/default.nix
View File

@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
export QXMLEDIT_INST_DOC_DIR="$doc"
'';
dontWrapQtApps = true;
meta = with lib; {
description = "Simple XML editor based on qt libraries" ;
homepage = "https://sourceforge.net/projects/qxmledit";

2
pkgs/applications/misc/gpsbabel/default.nix
View File

@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
dontWrapQtApps = true;
doCheck = true;
preCheck = ''
patchShebangs testo

2
pkgs/applications/misc/gpsbabel/gui.nix
View File

@ -10,6 +10,8 @@ mkDerivation {
nativeBuildInputs = [ qmake qttools ];
buildInputs = [ qtwebkit ];
dontWrapQtApps = true;
postPatch = ''
substituteInPlace mainwindow.cc \
--replace "QApplication::applicationDirPath() + \"/" "\"" \

2
pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
View File

@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ plasma-framework kwindowsystem plasma-pa ];
dontWrapQtApps = true;
meta = with lib; {
description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)";
homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer";

1
pkgs/applications/misc/redis-desktop-manager/default.nix
View File

@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
];
dontUseQmakeConfigure = true;
dontWrapQtApps = true;
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated" ];

2
pkgs/applications/misc/redshift-plasma-applet/default.nix
View File

@ -35,6 +35,8 @@ stdenv.mkDerivation {
kwindowsystem
];
dontWrapQtApps = true;
meta = with lib; {
description = "KDE Plasma 5 widget for controlling Redshift";
homepage = "https://github.com/kotelnik/plasma-applet-redshift-control";

2
pkgs/applications/misc/subsurface/default.nix
View File

@ -52,6 +52,8 @@ let
buildInputs = [ qtbase qtlocation libXcomposite ];
dontWrapQtApps = true;
pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins";
installPhase = ''

2
pkgs/applications/networking/irc/communi/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
dontWrapQtApps = true;
preConfigure = ''
export QMAKEFEATURES=${libcommuni}/features
'';

2
pkgs/applications/office/cb2bib/default.nix
View File

@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
runHook postConfigure
'';
dontWrapQtApps = true;
meta = with lib; {
description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files";
homepage = "http://www.molspaces.com/d_cb2bib-overview.php";

2
pkgs/applications/radio/gnuradio/default.nix
View File

@ -218,6 +218,7 @@ let
passthru
doCheck
dontWrapPythonPrograms
dontWrapQtApps
meta
;
cmakeFlags = shared.cmakeFlags
@ -284,6 +285,7 @@ stdenv.mkDerivation rec {
passthru
doCheck
dontWrapPythonPrograms
dontWrapQtApps
meta
;
}

1
pkgs/applications/radio/gnuradio/shared.nix
View File

@ -110,6 +110,7 @@ rec {
};
# Wrapping is done with an external wrapper
dontWrapPythonPrograms = true;
dontWrapQtApps = true;
# Tests should succeed, but it's hard to get LD_LIBRARY_PATH right in order
# for it to happen.
doCheck = false;

2
pkgs/applications/radio/unixcw/default.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [libpulseaudio alsaLib pkg-config qt5.qtbase];
CFLAGS ="-lasound -lpulse-simple";
dontWrapQtApps = true;
meta = with lib; {
description = "sound characters as Morse code on the soundcard or console speaker";
longDescription = ''

2
pkgs/applications/science/logic/mcrl2/default.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libGLU libGL qt5.qtbase boost ];
dontWrapQtApps = true;
meta = with lib; {
description = "A toolset for model-checking concurrent systems and protocols";
longDescription = ''

1
pkgs/applications/version-management/bcompare/default.nix
View File

@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
dontConfigure = true;
dontWrapQtApps = true;
meta = with lib; {
description = "GUI application that allows to quickly and easily compare files and folders";

2
pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
View File

@ -25,6 +25,8 @@ stdenv.mkDerivation {
NIX_LDFLAGS = "-lsvn_fs-1";
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://github.com/svn-all-fast-export/svn2git";
description = "A fast-import based converter for an svn repo to git repos";

2
pkgs/applications/video/obs-studio/obs-ndi.nix
View File

@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
"-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api"
];
dontWrapQtApps = true;
meta = with lib; {
description = "Network A/V plugin for OBS Studio";
homepage = "https://github.com/Palakis/obs-ndi";

2
pkgs/applications/video/obs-studio/v4l2sink.nix
View File

@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase obs-studio ];
dontWrapQtApps = true;
patches = [
# Fixes the segfault when stopping the plugin
(fetchpatch {

2
pkgs/applications/video/openshot-qt/libopenshot.nix
View File

@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
++ optional stdenv.isDarwin llvmPackages.openmp
;
dontWrapQtApps = true;
LIBOPENSHOT_AUDIO_DIR = libopenshot-audio;
"UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++";

2
pkgs/data/icons/maia-icon-theme/default.nix
View File

@ -35,6 +35,8 @@ stdenv.mkDerivation {
dontDropIconThemeCache = true;
dontWrapQtApps = true;
postInstall = ''
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme

2
pkgs/development/interpreters/supercollider/default.nix
View File

@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
++ optional (!stdenv.isDarwin) alsaLib
++ optional useSCEL emacs;
dontWrapQtApps = true;
meta = with lib; {
description = "Programming language for real time audio synthesis";
homepage = "https://supercollider.github.io";

2
pkgs/development/libraries/aqbanking/gwenhywfar.nix
View File

@ -57,6 +57,8 @@ in stdenv.mkDerivation rec {
buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ];
dontWrapQtApps = true;
meta = with lib; {
description = "OS abstraction functions used by aqbanking and related tools";
homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1";

2
pkgs/development/libraries/audio/suil/default.nix
View File

@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
++ (lib.optionals withQt4 [ qt4 ])
++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
dontWrapQtApps = true;
meta = with lib; {
homepage = "http://drobilla.net/software/suil";
description = "A lightweight C library for loading and wrapping LV2 plugin UIs";

1
pkgs/development/libraries/dxflib/default.nix
View File

@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
qmake
];
dontWrapQtApps = true;
preConfigure = ''
sed -i 's/CONFIG += staticlib/CONFIG += shared/' dxflib.pro
'';

2
pkgs/development/libraries/g2o/default.nix
View File

@ -23,6 +23,8 @@ mkDerivation rec {
# Silence noisy warning
CXXFLAGS = "-Wno-deprecated-copy";
dontWrapQtApps = true;
cmakeFlags = [
# Detection script is broken
"-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer"

1
pkgs/development/libraries/gecode/default.nix
View File

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
};
enableParallelBuilding = true;
dontWrapQtApps = true;
nativeBuildInputs = [ bison flex ];
buildInputs = [ perl gmp mpfr ]
++ lib.optional enableGist qtbase;

2
pkgs/development/libraries/gpgme/default.nix
View File

@ -50,6 +50,8 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
dontWrapQtApps = true;
configureFlags = [
"--enable-fixed-path=${gnupg}/bin"
"--with-libgpg-error-prefix=${libgpgerror.dev}"

2
pkgs/development/libraries/kpmcore/default.nix
View File

@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ extra-cmake-modules ];
dontWrapQtApps = true;
meta = with lib; {
maintainers = with lib.maintainers; [ peterhoeg ];
# The build requires at least Qt 5.14:

2
pkgs/development/libraries/libcommuni/default.nix
View File

@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
dontUseQmakeConfigure = true;
configureFlags = [ "-config" "release" ];
dontWrapQtApps = true;
preConfigure = ''
sed -i -e 's|/bin/pwd|pwd|g' configure
'';

2
pkgs/development/libraries/libdbusmenu-qt/default.nix
View File

@ -20,6 +20,8 @@ stdenv.mkDerivation {
cmakeFlags = [ "-DWITH_DOC=OFF" ];
dontWrapQtApps = true;
meta = with lib; {
description = "Provides a Qt implementation of the DBusMenu spec";
inherit homepage;

2
pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
View File

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DWITH_DOC=OFF" ];
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://launchpad.net/libdbusmenu-qt";
description = "Provides a Qt implementation of the DBusMenu spec";

2
pkgs/development/libraries/libkeyfinder/default.nix
View File

@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake ];
buildInputs = [ fftw qtbase ];
dontWrapQtApps = true;
postPatch = ''
substituteInPlace LibKeyFinder.pro \
--replace "/usr/local" "$out" \

2
pkgs/development/libraries/libktorrent/default.nix
View File

@ -27,6 +27,8 @@ in stdenv.mkDerivation rec {
inherit mainVersion;
};
dontWrapQtApps = true;
meta = with lib; {
description = "A BitTorrent library used by KTorrent";
homepage = "https://www.kde.org/applications/internet/ktorrent/";

2
pkgs/development/libraries/liblastfm/default.nix
View File

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://github.com/lastfm/liblastfm";
repositories.git = "git://github.com/lastfm/liblastfm.git";

2
pkgs/development/libraries/libqglviewer/default.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase libGLU ]
++ lib.optional stdenv.isDarwin AGL;
dontWrapQtApps = true;
postPatch = ''
cd QGLViewer
'';

2
pkgs/development/libraries/opencsg/default.nix
View File

@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
rmdir $out/bin || true
'';
dontWrapQtApps = true;
postFixup = lib.optionalString stdenv.isDarwin ''
app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample
install_name_tool -change \

2
pkgs/development/libraries/phonon/backends/gstreamer.nix
View File

@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
# on system paths being set.
patches = [ ./gst-plugin-paths.patch ];
dontWrapQtApps = true;
NIX_CFLAGS_COMPILE =
let gstPluginPaths =
lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0"

2
pkgs/development/libraries/phonon/backends/vlc.nix
View File

@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
extra-cmake-modules
];
dontWrapQtApps = true;
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
];

2
pkgs/development/libraries/phonon/default.nix
View File

@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
"-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
];
dontWrapQtApps = true;
preConfigure = ''
cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs"
cmakeFlags+=" -DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix"

2
pkgs/development/libraries/polkit-qt-1/qt-5.nix
View File

@ -16,6 +16,8 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ polkit glib qtbase ];
dontWrapQtApps = true;
postFixup = ''
# Fix library location in CMake module
sed -i "$dev/lib/cmake/PolkitQt5-1/PolkitQt5-1Config.cmake" \

2
pkgs/development/libraries/poppler/0.61.nix
View File

@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
(mkFlag qt5Support "QT5")
];
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://poppler.freedesktop.org/";
description = "A PDF rendering library";

2
pkgs/development/libraries/poppler/default.nix
View File

@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
'';
dontWrapQtApps = true;
cmakeFlags = [
(mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS"
(mkFlag (!minimal) "GLIB")

2
pkgs/development/libraries/pyotherside/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
python3 qtbase qtquickcontrols qtsvg ncurses
];
dontWrapQtApps = true;
patches = [ ./qml-path.patch ];
installTargets = [ "sub-src-install_subtargets" ];

2
pkgs/development/libraries/python-qt/default.nix
View File

@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
"PYTHON_PATH=${python}/bin"
"PYTHON_LIB=${python}/lib"];
dontWrapQtApps = true;
unpackCmd = "unzip $src";
installPhase = ''

2
pkgs/development/libraries/qca-qt5/default.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl qtbase ];
nativeBuildInputs = [ cmake pkg-config ];
dontWrapQtApps = true;
# Without this patch cmake fails with a "No known features for CXX compiler"
# error on darwin
patches = lib.optional stdenv.isDarwin ./move-project.patch ;

1
pkgs/development/libraries/qmlbox2d/default.nix
View File

@ -9,6 +9,7 @@ stdenv.mkDerivation {
};
enableParallelBuilding = true;
dontWrapQtApps = true;
nativeBuildInputs = [ qmake ];
buildInputs = [ qtdeclarative ];

2
pkgs/development/libraries/qmltermwidget/default.nix
View File

@ -32,6 +32,8 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
dontWrapQtApps = true;
meta = {
description = "A QML port of qtermwidget";
homepage = "https://github.com/Swordfish90/qmltermwidget";

2
pkgs/development/libraries/qoauth/default.nix
View File

@ -21,6 +21,8 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto";
NIX_LDFLAGS = "-lqca-qt5";
dontWrapQtApps = true;
meta = with lib; {
description = "Qt library for OAuth authentication";
inherit (qtbase.meta) platforms;

1
pkgs/development/libraries/qscintilla/default.nix
View File

@ -35,6 +35,7 @@ in stdenv.mkDerivation rec {
'';
enableParallelBuilding = true;
dontWrapQtApps = true;
postPatch = ''
substituteInPlace qscintilla.pro \

9
pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh
View File

@ -100,4 +100,13 @@ if [ -z "${dontPatchMkspecs-}" ]; then
postPhases="${postPhases-}${postPhases:+ }postPatchMkspecs"
fi
qtPreHook() {
# Check that wrapQtAppsHook is used, or it is explicitly disabled.
if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then
echo >&2 "Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set."
exit 1
fi
}
prePhases+=" qtPreHook"
fi

2
pkgs/development/libraries/qt-5/qtModule.nix
View File

@ -34,6 +34,8 @@ mkDerivation (args // {
fixQtBuiltinPaths . '*.pr?'
'';
dontWrapQtApps = args.dontWrapQtApps or true;
postFixup = ''
if [ -d "''${!outputDev}/lib/pkgconfig" ]; then
find "''${!outputDev}/lib/pkgconfig" -name '*.pc' | while read pc; do

1
pkgs/development/libraries/qtinstaller/default.nix
View File

@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
setOutputFlags = false;
enableParallelBuilding = true;
NIX_QT_SUBMODULE = true;
dontWrapQtApps = true;
installPhase = ''
mkdir -p $out/{bin,lib,share/qt-installer-framework}

2
pkgs/development/libraries/qtkeychain/default.nix
View File

@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1
};
dontWrapQtApps = true;
patches = (if withQt5 then [] else [ ./0001-Fixes-build-with-Qt4.patch ]) ++ (if stdenv.isDarwin then [ ./0002-Fix-install-name-Darwin.patch ] else []);
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];

2
pkgs/development/libraries/qtpbfimageplugin/default.nix
View File

@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase protobuf ];
dontWrapQtApps = true;
postPatch = ''
# Fix plugin dir
substituteInPlace pbfplugin.pro \

2
pkgs/development/libraries/qtutilities/default.nix
View File

@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase cpp-utilities ];
nativeBuildInputs = [ cmake qttools ];
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://github.com/Martchus/qtutilities";
description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities";

2
pkgs/development/libraries/qtwebkit-plugins/default.nix
View File

@ -14,6 +14,8 @@ stdenv.mkDerivation {
buildInputs = [ qtwebkit hunspell ];
dontWrapQtApps = true;
postPatch = ''
sed -i "s,-lhunspell,-lhunspell-${lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri
sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro

2
pkgs/development/libraries/quazip/default.nix
View File

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
dontWrapQtApps = true;
meta = with lib; {
description = "Provides access to ZIP archives from Qt programs";
license = licenses.lgpl21Plus;

2
pkgs/development/libraries/qwt/6.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ];
dontWrapQtApps = true;
meta = with lib; {
description = "Qt widgets for technical applications";
homepage = "http://qwt.sourceforge.net/";

2
pkgs/development/libraries/soqt/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://github.com/coin3d/soqt";
license = licenses.bsd3;

2
pkgs/development/libraries/telepathy/qt/default.nix
View File

@ -20,6 +20,8 @@ in stdenv.mkDerivation rec {
# On 0.9.7, they do not even build with QT4
cmakeFlags = lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
dontWrapQtApps = true;
doCheck = false; # giving up for now
meta = with lib; {

2
pkgs/development/libraries/vtk/generic.nix
View File

@ -57,6 +57,8 @@ in stdenv.mkDerivation rec {
export LD_LIBRARY_PATH="$(pwd)/lib";
'';
dontWrapQtApps = true;
# Shared libraries don't work, because of rpath troubles with the current
# nixpkgs cmake approach. It wants to call a binary at build time, just
# built and requiring one of the shared objects.

2
pkgs/development/python-modules/ovito/default.nix
View File

@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ];
dontWrapQtApps = true;
meta = with lib; {
description = "Scientific visualization and analysis software for atomistic simulation data";
homepage = "https://www.ovito.org";

3
pkgs/development/python-modules/pivy/default.nix
View File

@ -29,8 +29,7 @@ buildPythonPackage rec {
];
dontUseQmakeConfigure = true;
dontUseCmakeConfigure = true;
dontWrapQtApps =true;
doCheck = false;
postPatch = ''

2
pkgs/development/python-modules/poppler-qt5/default.nix
View File

@ -34,6 +34,8 @@ buildPythonPackage rec {
# no tests, just bindings for `poppler_qt5`
doCheck = false;
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://github.com/wbsoft/python-poppler-qt5";
license = licenses.gpl2;

2
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -40,6 +40,8 @@ in buildPythonPackage rec {
outputs = [ "out" "dev" ];
dontWrapQtApps = true;
nativeBuildInputs = [
pkg-config
qmake

2
pkgs/development/python-modules/pyqtwebengine/default.nix
View File

@ -45,6 +45,8 @@ in buildPythonPackage rec {
propagatedBuildInputs = [ pyqt5 ]
++ lib.optional (!isPy3k) enum34;
dontWrapQtApps = true;
configurePhase = ''
runHook preConfigure

2
pkgs/development/python-modules/pyside/default.nix
View File

@ -23,6 +23,8 @@ buildPythonPackage rec {
makeFlags = [ "QT_PLUGIN_PATH=${pysideShiboken}/lib/generatorrunner" ];
dontWrapQtApps = true;
meta = {
description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
license = lib.licenses.lgpl21;

2
pkgs/development/python-modules/pyside2-tools/default.nix
View File

@ -25,6 +25,8 @@ stdenv.mkDerivation {
"-DBUILD_TESTS=OFF"
];
dontWrapQtApps = true;
# The upstream build system consists of a `setup.py` whichs builds three
# different python libraries and calls cmake as a subprocess. We call cmake
# directly because that's easier to get working. However, the `setup.py`

2
pkgs/development/python-modules/pyside2/default.nix
View File

@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs = [ shiboken2 ];
dontWrapQtApps = true;
meta = with lib; {
description = "LGPL-licensed Python bindings for Qt";
license = licenses.lgpl21;

2
pkgs/development/python-modules/qscintilla-qt5/default.nix
View File

@ -14,6 +14,8 @@ buildPythonPackage {
buildInputs = [ qscintilla ];
propagatedBuildInputs = [ pyqt5 ];
dontWrapQtApps = true;
postPatch = ''
substituteInPlace Python/configure.py \
--replace \

2
pkgs/development/python-modules/roboschool/default.nix
View File

@ -44,6 +44,8 @@ buildPythonPackage rec {
boost
];
dontWrapQtApps = true;
NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}";
patches = [

2
pkgs/development/python-modules/shiboken2/default.nix
View File

@ -23,6 +23,8 @@ stdenv.mkDerivation {
"-DBUILD_TESTS=OFF"
];
dontWrapQtApps = true;
postInstall = ''
rm $out/bin/shiboken_tool.py
'';

2
pkgs/development/tools/analysis/panopticon/default.nix
View File

@ -23,6 +23,8 @@ rustPlatform.buildRustPackage rec {
git
];
dontWrapQtApps = true;
cargoSha256 = "1hdsn011y9invfy7can8c02zwa7birj9y1rxhrj7wyv4gh3659i0";
doCheck = false;

2
pkgs/development/tools/analysis/qcachegrind/default.nix
View File

@ -12,6 +12,8 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ qmake ];
dontWrapQtApps = true;
postInstall = ''
mkdir -p $out/bin
cp -p converters/dprof2calltree $out/bin/dprof2calltree

5
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -14,7 +14,7 @@
assert withQt5 -> useQt4 == false;
assert useQt4 -> withQt5 == false;
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
pname = "cmake"
+ lib.optionalString isBootstrap "-boot"
+ lib.optionalString useNcurses "-cursesUI"
@ -130,4 +130,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ttuegel lnl7 ];
license = licenses.bsd3;
};
}
} // (if withQt5 then { dontWrapQtApps = true; } else {})
)

2
pkgs/development/tools/build-managers/qbs/default.nix
View File

@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake ];
dontWrapQtApps = true;
qmakeFlags = [ "QBS_INSTALL_PREFIX=$(out)" "qbs.pro" ];
buildInputs = [ qtbase qtscript ];

1
pkgs/development/tools/minizinc/ide.nix
View File

@ -19,6 +19,7 @@ stdenv.mkDerivation {
sourceRoot = "source/MiniZincIDE";
enableParallelBuilding = true;
dontWrapQtApps = true;
postInstall = ''
wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${lib.makeBinPath [ minizinc ]}

2
pkgs/development/tools/misc/kdbg/default.nix
View File

@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix}
'';
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://www.kdbg.org/";
description = ''

2
pkgs/development/tools/phantomjs2/default.nix
View File

@ -77,6 +77,8 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
dontWrapQtApps = true;
installPhase = ''
mkdir -p $out/share/doc/phantomjs
cp -a bin $out

2
pkgs/development/tools/rgp/default.nix
View File

@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
"${placeholder "out"}/opt/rgp/qt"
];
dontWrapQtApps = true;
installPhase = ''
mkdir -p $out/opt/rgp $out/bin
cp -r . $out/opt/rgp/

2
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
View File

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
cp -r DwarfTherapist.app $out/Applications
'' else null;
dontWrapQtApps = true;
meta = with lib; {
description = "Tool to manage dwarves in a running game of Dwarf Fortress";
maintainers = with maintainers; [ abbradar bendlas numinit jonringer ];

2
pkgs/games/freeciv/default.nix
View File

@ -37,6 +37,8 @@ in stdenv.mkDerivation rec {
++ optional server readline
++ optional enableSqlite sqlite;
dontWrapQtApps = true;
configureFlags = [ "--enable-shared" ]
++ optional sdlClient "--enable-client=sdl"
++ optionals qtClient [

2
pkgs/games/leela-zero/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
dontWrapQtApps = true;
meta = with lib; {
description = "Go engine modeled after AlphaGo Zero";
homepage = "https://github.com/gcp/leela-zero";

2
pkgs/games/openmw/default.nix
View File

@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
"-DDESIRED_QT_VERSION:INT=5"
];
dontWrapQtApps = true;
meta = with lib; {
description = "An unofficial open source engine reimplementation of the game Morrowind";
homepage = "http://openmw.org";

2
pkgs/games/openmw/tes3mp.nix
View File

@ -61,6 +61,8 @@ in openmw.overrideAttrs (oldAttrs: rec {
"-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a"
];
dontWrapQtApps = true;
# https://github.com/TES3MP/openmw-tes3mp/issues/552
patches = [
./tes3mp.patch

Some files were not shown because too many files have changed in this diff Show More