From c816bbc8a86c7ea6c09ca42e1694fe08003a55fc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 17 May 2017 14:26:11 -0500
Subject: [PATCH] qt5: remove makeQtWrapper
---
pkgs/applications/audio/audacious/qt-5.nix | 18 +++-----
pkgs/applications/audio/cantata/default.nix | 8 +---
pkgs/applications/audio/dfasma/default.nix | 8 +---
.../audio/sonic-visualiser/default.nix | 5 +--
.../editors/kdevelop5/kdevelop.nix | 4 +-
.../editors/kdevelop5/kdevplatform.nix | 7 ++-
pkgs/applications/editors/neovim/qt.nix | 8 ++--
pkgs/applications/graphics/ipe/default.nix | 9 ++--
pkgs/applications/graphics/krita/default.nix | 16 ++-----
.../applications/graphics/photoqt/default.nix | 9 ++--
.../graphics/renderdoc/default.nix | 8 ++--
pkgs/applications/kde/ark/default.nix | 10 ++---
pkgs/applications/kde/filelight.nix | 4 +-
pkgs/applications/kde/gwenview.nix | 14 +++---
pkgs/applications/kde/k3b.nix | 11 ++---
pkgs/applications/kde/kate.nix | 7 +--
pkgs/applications/kde/kcachegrind.nix | 7 +--
pkgs/applications/kde/kcalc.nix | 4 +-
pkgs/applications/kde/kcolorchooser.nix | 4 +-
pkgs/applications/kde/kcontacts.nix | 3 +-
pkgs/applications/kde/kdenlive.nix | 21 ++++-----
pkgs/applications/kde/kdf.nix | 4 +-
pkgs/applications/kde/kgpg.nix | 17 ++++----
pkgs/applications/kde/khelpcenter.nix | 11 ++---
pkgs/applications/kde/kig.nix | 9 ++--
pkgs/applications/kde/kmix.nix | 4 +-
pkgs/applications/kde/kolourpaint.nix | 3 +-
pkgs/applications/kde/kompare.nix | 4 +-
pkgs/applications/kde/konsole.nix | 12 +++---
pkgs/applications/kde/krfb.nix | 7 +--
pkgs/applications/kde/kwalletmanager.nix | 3 +-
pkgs/applications/kde/marble.nix | 4 +-
pkgs/applications/kde/okteta.nix | 7 ++-
pkgs/applications/kde/okular.nix | 13 +++---
pkgs/applications/kde/print-manager.nix | 14 +++---
pkgs/applications/kde/spectacle.nix | 13 +++---
pkgs/applications/misc/albert/default.nix | 12 ++----
.../misc/cool-retro-term/default.nix | 6 +--
pkgs/applications/misc/cura/default.nix | 10 ++---
.../misc/golden-cheetah/default.nix | 10 ++---
pkgs/applications/misc/gpxsee/default.nix | 5 +--
pkgs/applications/misc/kdeconnect/default.nix | 10 +----
pkgs/applications/misc/openbrf/default.nix | 6 +--
.../misc/qsyncthingtray/default.nix | 12 +++---
pkgs/applications/misc/qtpass/default.nix | 8 ++--
.../misc/redis-desktop-manager/default.nix | 5 +--
pkgs/applications/misc/xca/default.nix | 17 +++-----
.../browsers/qutebrowser/default.nix | 9 ++--
.../networking/dropbox/default.nix | 13 +++---
.../instant-messengers/qtox/default.nix | 13 +++---
.../instant-messengers/quaternion/default.nix | 12 ++----
.../instant-messengers/ricochet/default.nix | 5 +--
.../telegram/cutegram/default.nix | 6 +--
.../telegram/tdesktop/default.nix | 11 +++--
.../instant-messengers/tensor/default.nix | 6 +--
.../networking/irc/communi/default.nix | 5 +--
.../networking/irc/konversation/default.nix | 3 --
.../mailreaders/trojita/default.nix | 18 +++-----
.../networking/mumble/default.nix | 6 +--
.../newsreaders/quiterss/default.nix | 8 +---
pkgs/applications/office/mendeley/default.nix | 5 ++-
pkgs/applications/office/mytetra/default.nix | 6 +--
pkgs/applications/office/skrooge/default.nix | 16 +++----
.../science/astronomy/stellarium/default.nix | 27 +++++-------
.../science/electronics/fritzing/default.nix | 10 +----
.../science/math/speedcrunch/default.nix | 14 ++----
.../robotics/qgroundcontrol/default.nix | 6 +--
pkgs/applications/video/bomi/default.nix | 10 ++---
.../video/openshot-qt/default.nix | 2 +-
pkgs/applications/video/shotcut/default.nix | 6 +--
.../virtualization/virt-manager/qt.nix | 18 +++-----
.../virtualization/virtualbox/default.nix | 8 +---
pkgs/desktops/plasma-5/systemsettings.nix | 2 +-
.../development/libraries/libqtav/default.nix | 14 ++----
.../libraries/qt-5/5.6/default.nix | 5 ---
.../libraries/qt-5/5.8/default.nix | 6 ---
.../qt-5/5.8/qtdeclarative/default.nix | 12 +-----
.../libraries/qt-5/5.8/qttools/default.nix | 16 +------
.../libraries/qt-5/make-qt-wrapper-darwin.sh | 35 ---------------
.../libraries/qt-5/make-qt-wrapper.sh | 43 -------------------
pkgs/development/qtcreator/default.nix | 5 +--
.../tools/analysis/qcachegrind/default.nix | 6 +--
.../tools/database/sqlitebrowser/default.nix | 18 +++-----
pkgs/development/tools/tora/default.nix | 12 +++---
pkgs/development/tools/vogl/default.nix | 20 ++++-----
pkgs/os-specific/linux/v4l-utils/default.nix | 8 +---
pkgs/tools/audio/qastools/default.nix | 11 +++--
pkgs/tools/misc/antimicro/default.nix | 13 +++---
pkgs/tools/misc/qt5ct/default.nix | 6 +--
pkgs/tools/misc/radeon-profile/default.nix | 5 +--
pkgs/tools/misc/rockbox-utility/default.nix | 6 +--
pkgs/top-level/all-packages.nix | 8 ++--
92 files changed, 323 insertions(+), 582 deletions(-)
delete mode 100644 pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
delete mode 100644 pkgs/development/libraries/qt-5/make-qt-wrapper.sh
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index 663e0eb0cc8c..da143c7d946a 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -1,6 +1,6 @@
{
- stdenv, lib, fetchurl,
- gettext, makeQtWrapper, pkgconfig,
+ mkDerivation, lib, fetchurl,
+ gettext, pkgconfig,
qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug,
@@ -24,16 +24,14 @@ let
};
in
-stdenv.mkDerivation {
+mkDerivation {
inherit version;
name = "audacious-qt5-${version}";
sourceFiles = lib.attrValues sources;
sourceRoots = lib.attrNames sources;
- nativeBuildInputs = [
- gettext makeQtWrapper pkgconfig
- ];
+ nativeBuildInputs = [ gettext pkgconfig ];
buildInputs = [
# Core dependencies
@@ -68,15 +66,9 @@ stdenv.mkDerivation {
fi
done
-
- source $stdenv/setup
- wrapQtProgram $out/bin/audacious
- wrapQtProgram $out/bin/audtool
'';
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Audio player";
homepage = http://audacious-media-player.org/;
maintainers = with maintainers; [ ttuegel ];
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 3231e3e53017..82a6d44f6436 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, vlc
, withQt4 ? false, qt4
-, withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper
+, withQt5 ? true, qtbase, qtsvg, qttools
# Cantata doesn't build with cdparanoia enabled so we disable that
# default for now until I (or someone else) figure it out.
@@ -63,8 +63,6 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
++ stdenv.lib.optional (withTaglib && withDevices) udisks2;
- nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper;
-
cmakeFlags = stdenv.lib.flatten [
(fstat withQt5 "QT5")
(fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
@@ -88,10 +86,6 @@ stdenv.mkDerivation rec {
sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
'';
- postInstall = stdenv.lib.optionalString withQt5 ''
- wrapQtProgram "$out/bin/cantata"
- '';
-
meta = with stdenv.lib; {
homepage = https://github.com/cdrummond/cantata;
description = "A graphical client for MPD";
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 53ca8d316a2e..918accb4e167 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake, makeQtWrapper }:
+{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }:
let
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ fftw libsndfile qtbase qtmultimedia ];
- nativeBuildInputs = [ makeQtWrapper qmake ];
+ nativeBuildInputs = [ qmake ];
postPatch = ''
substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
@@ -53,10 +53,6 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
- postInstall = ''
- wrapQtProgram "$out/bin/dfasma"
- '';
-
meta = with stdenv.lib; {
description = "Analyse and compare audio files in time and frequency";
longDescription = ''
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index d1e9b50dee31..bdb9911d3650 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -2,7 +2,7 @@
{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland
+, libsndfile, pkgconfig, libpulseaudio, qtbase, redland
, qmake, rubberband, serd, sord, vampSDK, fftwFloat
}:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
libX11
];
- nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+ nativeBuildInputs = [ pkgconfig qmake ];
configurePhase = ''
for i in sonic-visualiser svapp svcore svgui;
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
mkdir -p $out/{bin,share/sonic-visualiser}
cp sonic-visualiser $out/bin/
cp -r samples $out/share/sonic-visualiser/
- wrapQtProgram "$out/bin/sonic-visualiser"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index d4f07d82bf0d..bbd9be220744 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, wrapGAppsHook
+{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules
, qtquickcontrols, qtwebkit, qttools, kde-cli-tools
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
@@ -21,7 +21,7 @@ mkDerivation rec {
};
nativeBuildInputs = [
- cmake gettext pkgconfig extra-cmake-modules makeWrapper wrapGAppsHook
+ cmake gettext pkgconfig extra-cmake-modules makeWrapper
];
buildInputs = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index d3680aff3d85..3efc1335c075 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
+{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules
, boost, subversion, apr, aprutil
, qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n
, kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications
@@ -11,7 +11,7 @@ let
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
-
+
src = fetchurl {
url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz";
sha256 = "3159440512b1373c1a4b35f401ba1f81217de9578372b45137af141eeda6e726";
@@ -25,9 +25,8 @@ stdenv.mkDerivation rec {
})
];
- nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
+ nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ];
- propagatedBuildInputs = [ ];
buildInputs = [
boost subversion apr aprutil
qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 57f52f0e5fcf..e24ca50a0247 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, doxygen
-, libmsgpack, makeQtWrapper, neovim, pythonPackages, qtbase }:
+{ stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper
+, libmsgpack, neovim, pythonPackages, qtbase }:
stdenv.mkDerivation rec {
name = "neovim-qt-${version}";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
jinja2 msgpack python
]);
- nativeBuildInputs = [ cmake doxygen makeQtWrapper ];
+ nativeBuildInputs = [ cmake doxygen makeWrapper ];
enableParallelBuilding = true;
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
- wrapQtProgram "$out/bin/nvim-qt" \
+ wrapProgram "$out/bin/nvim-qt" \
--prefix PATH : "${neovim}/bin"
'';
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 4a99d0ea4a17..2b1b1f8da8a6 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
+{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
, libjpeg, qtbase
-, makeQtWrapper
}:
stdenv.mkDerivation rec {
@@ -28,14 +27,14 @@ stdenv.mkDerivation rec {
LUA_PACKAGE = "lua";
buildInputs = [
- libjpeg pkgconfig zlib qtbase freetype cairo lua5 texlive ghostscript
+ libjpeg zlib qtbase freetype cairo lua5 texlive ghostscript
];
- nativeBuildInputs = [ makeQtWrapper ];
+ nativeBuildInputs = [ makeWrapper pkgconfig ];
postFixup = ''
for prog in $out/bin/*; do
- wrapQtProgram "$prog" --prefix PATH : "${texlive}/bin"
+ wrapProgram "$prog" --prefix PATH : "${texlive}/bin"
done
'';
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index c82d1565a550..121afdf2084b 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules
, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash
@@ -6,7 +6,7 @@
, openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "krita-${version}";
ver_min = "3.1.3";
version = "${ver_min}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "125js6c8aw4bqhs28pwnl3rbgqx5yx4zsklw7bfdhy3vf6lrysw1";
};
- nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
+ nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
@@ -27,15 +27,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
- enableParallelBuilding = true;
-
- postInstall = ''
- for i in $out/bin/*; do
- wrapQtProgram "$i"
- done
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A free an open source painting application";
homepage = "https://krita.org/";
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index f9b24581929a..d6bcdee41375 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, makeQtWrapper, exiv2, graphicsmagick
+{ stdenv, fetchurl, cmake, exiv2, graphicsmagick
, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools
}:
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
};
+ nativeBuildInputs = [ cmake ];
buildInputs = [
- cmake makeQtWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick
+ qtbase qtquickcontrols qttools exiv2 graphicsmagick
qtmultimedia qtdeclarative
];
@@ -21,10 +22,6 @@ stdenv.mkDerivation rec {
export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
'';
- postInstall = ''
- wrapQtProgram $out/bin/photoqt
- '';
-
meta = {
homepage = "http://photoqt.org/";
description = "Simple, yet powerful and good looking image viewer";
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index be4457c932fa..d69f9a676c1b 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras
-, pkgconfig, xorg, makeQtWrapper, vulkan-loader
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig
+, qtbase, qtx11extras, vulkan-loader, xorg
}:
stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
qtbase xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader
];
- nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
+ nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
cmakeFlags = [
"-DBUILD_VERSION_HASH=${src.rev}-distro-nix"
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
mkdir $out/bin/.bin
mv $out/bin/qrenderdoc $out/bin/.bin/qrenderdoc
ln -s $out/bin/.bin/qrenderdoc $out/bin/qrenderdoc
- wrapQtProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
+ wrapProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
mv $out/bin/renderdoccmd $out/bin/.bin/renderdoccmd
ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd
wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index f52f30c79177..f2976c38c39b 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, config, wrapGAppsHook,
+ mkDerivation, lib, config, makeWrapper,
extra-cmake-modules, kdoctools,
@@ -15,20 +15,18 @@
mkDerivation {
name = "ark";
- nativeBuildInputs = [
- extra-cmake-modules kdoctools wrapGAppsHook
- ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
propagatedBuildInputs = [
khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
kpty kwidgetsaddons libarchive kitemmodels
];
- preFixup =
+ postFixup =
let
PATH =
lib.makeBinPath
([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
in ''
- gappsWrapperArgs+=(--prefix PATH : "${PATH}")
+ wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}"
'';
meta = {
license = with lib.licenses;
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
index d3925d54988c..6eb219d8da96 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
kio, kparts, kxmlgui, qtscript, solid
}:
@@ -10,7 +10,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh vcunat ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kio kparts kxmlgui qtscript solid
];
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index d206e901f8e6..99be13ba7f88 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -1,8 +1,9 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
- baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
- libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
+ extra-cmake-modules, kdoctools,
+ exiv2, lcms2,
+ baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,
+ phonon, qtimageformats, qtsvg, qtx11extras
}:
mkDerivation {
@@ -11,10 +12,11 @@ mkDerivation {
license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ exiv2 lcms2 ];
propagatedBuildInputs = [
- baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
- libkipi phonon qtimageformats qtsvg qtx11extras
+ baloo kactivities kdelibs4support kio libkdcraw libkipi phonon
+ qtimageformats qtsvg qtx11extras
];
propagatedUserEnvPkgs = [ kipi-plugins ];
}
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index 6fd6fbee9f58..e1f1132a08f3 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,6 +1,7 @@
-{ mkDerivation, lib, wrapGAppsHook, extra-cmake-modules
+{ mkDerivation, lib
+, extra-cmake-modules, kdoctools, makeWrapper
, qtwebkit
-, libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
+, libkcddb, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
, flac, lame, libmad, libmpcdec, libvorbis
, libsamplerate, libsndfile, taglib
, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
@@ -14,7 +15,7 @@ mkDerivation {
maintainers = with maintainers; [ sander phreedom ];
platforms = platforms.linux;
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
propagatedBuildInputs = [
# qt
qtwebkit
@@ -29,12 +30,12 @@ mkDerivation {
# others
ffmpeg libmusicbrainz2
];
- preFixup =
+ postFixup =
let k3bPath = lib.makeBinPath [
cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode
vcdimager
];
in ''
- gappsWrapperArgs+=(--prefix PATH : "${k3bPath}")
+ wrapProgram "$out/bin/k3b" --prefix PATH : "${k3bPath}"
'';
}
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index 357abf965058..e6b4f6b6bdd4 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
@@ -13,12 +13,13 @@ mkDerivation {
license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ libgit2 ];
propagatedBuildInputs = [
kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
- knewstuff libgit2
+ knewstuff
];
propagatedUserEnvPkgs = [ konsole ];
}
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index c45edc87f896..a8833cfbf592 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
kio, ki18n,
perl, python, php
}:
@@ -11,10 +11,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ orivej ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kio ];
buildInputs = [ perl python php ki18n ];
- preFixup = ''
- gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ perl php python]}")
- '';
}
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 2a3d7e17a55a..856da42c835a 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
}:
@@ -10,7 +10,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.fridh ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ gmp ];
propagatedBuildInputs = [
kconfig kconfigwidgets kguiaddons kinit knotifications
diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
index 5f33611f29a9..186505a050c3 100644
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ b/pkgs/applications/kde/kcolorchooser.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, wrapGAppsHook,
+ extra-cmake-modules,
ki18n, kwidgetsaddons, kxmlgui
}:
@@ -10,7 +10,7 @@ mkDerivation {
license = with lib.licenses; [ mit ];
maintainers = [ lib.maintainers.ttuegel ];
};
- nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ki18n ];
propagatedBuildInputs = [ kwidgetsaddons kxmlgui ];
}
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index a56ca6845455..e7876d0d43e9 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -1,6 +1,7 @@
{
mkDerivation, lib,
- extra-cmake-modules, ki18n,
+ extra-cmake-modules,
+ ki18n,
kcoreaddons, kconfig, kcodecs
}:
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index c9929026aa60..854e346e2909 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -2,7 +2,6 @@
, lib
, extra-cmake-modules
, kdoctools
-, wrapGAppsHook
, qtscript
, kactivities
, kconfig
@@ -39,16 +38,16 @@ mkDerivation {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
- wrapGAppsHook
];
buildInputs = [
- qtscript
kconfig
kcrash
+ kdbusaddons
+ kfilemetadata
kguiaddons
+ ki18n
kiconthemes
kinit
- kdbusaddons
knotifications
knewstuff
karchive
@@ -56,16 +55,18 @@ mkDerivation {
kplotting
ktextwidgets
mlt
+ phonon-backend-gstreamer
+ qtquickcontrols
+ qtscript
shared_mime_info
libv4l
ffmpeg
];
- propagatedBuildInputs = [
- kactivities kconfig kcrash kguiaddons kiconthemes kinit kio kio-extras
- kdbusaddons kfilemetadata knotifications knewstuff karchive knotifyconfig
- kplotting ktextwidgets kwindowsystem plasma-framework
- phonon-backend-gstreamer qtquickcontrols shared_mime_info
- ];
+ postPatch =
+ # Module Qt5::Concurrent must be included in `find_package` before it is used.
+ ''
+ sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
+ '';
meta = {
license = with lib.licenses; [ gpl2Plus ];
};
diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix
index 5a969aa15cfe..333fea3df53e 100644
--- a/pkgs/applications/kde/kdf.nix
+++ b/pkgs/applications/kde/kdf.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
kcmutils
}:
@@ -10,6 +10,6 @@ mkDerivation {
license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.peterhoeg ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kcmutils ];
}
diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index 1a30b0685f88..ca495a1ae269 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
@@ -1,21 +1,22 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, ki18n, wrapGAppsHook,
- akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
- kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
+ extra-cmake-modules, kdoctools, ki18n, makeWrapper,
+ akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons,
+ kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
}:
mkDerivation {
name = "kgpg";
- nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n wrapGAppsHook ];
- buildInputs = [
- akonadi-contacts gnupg1 gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
+ nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
+ buildInputs = [ gnupg1 gpgme ki18n ];
+ propagatedBuildInputs = [
+ akonadi-contacts karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
kwidgetsaddons kwindowsystem
];
- preFixup = ''
- gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gnupg1 ]})
+ postFixup = ''
+ wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}"
'';
meta = {
license = [ lib.licenses.gpl2 ];
diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index 9862d75fdf42..db68cec976e3 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
@@ -1,15 +1,16 @@
{
mkDerivation,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
kdelibs4support, khtml, kservice, xapian
}:
mkDerivation {
name = "khelpcenter";
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
- buildInputs = [
- grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
- kinit kcmutils kservice xapian
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ ki18n xapian ];
+ propagatedBuildInputs = [
+ grantlee kdelibs4support khtml kconfig kcoreaddons kdbusaddons
+ kinit kcmutils kservice
];
}
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index 6fdad9766b2b..f2a1d275f6e5 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
}:
@@ -10,9 +10,10 @@ mkDerivation {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ raskin ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
- buildInputs = [
- kparts qtsvg qtxmlpatterns ktexteditor boost
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ boost ];
+ propagatedBuildInputs = [
+ kparts qtsvg qtxmlpatterns ktexteditor
];
}
diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
index cc5e67a1ddcd..058fd8178c4a 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
}:
@@ -11,7 +11,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.rongcuid ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
propagatedBuildInputs = [
kglobalaccel kxmlgui kcoreaddons kdelibs4support
diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix
index a9e6904156a7..db4cb75cc35c 100644
--- a/pkgs/applications/kde/kolourpaint.nix
+++ b/pkgs/applications/kde/kolourpaint.nix
@@ -2,14 +2,13 @@
, mkDerivation
, extra-cmake-modules
, kdoctools
-, wrapGAppsHook
, kdelibs4support
, libkexiv2
}:
mkDerivation {
name = "kolourpaint";
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kdelibs4support libkexiv2 ];
meta = {
maintainers = [ lib.maintainers.fridh ];
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index 1a0c2211c800..cf2fa2e6a10f 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -1,13 +1,13 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
kparts, ktexteditor, kwidgetsaddons, libkomparediff2
}:
mkDerivation {
name = "kompare";
meta = { license = with lib.licenses; [ gpl2 ]; };
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kparts ktexteditor kwidgetsaddons libkomparediff2
];
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index 4a4a261c4332..bd026c6f0395 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
@@ -13,11 +13,11 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ ki18n ];
propagatedBuildInputs = [
- kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
- kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio
- knotifications knotifyconfig kparts kpty kservice ktextwidgets
- kwidgetsaddons kxmlgui
+ kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
+ kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty
+ kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript
];
}
diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
index a5a34b684602..0f4aecb83d41 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
kdelibs4support, kdnssd, libvncserver, libXtst
}:
@@ -10,6 +10,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = with lib.maintainers; [ jerith666 ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
- propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ libvncserver libXtst ];
+ propagatedBuildInputs = [ kdelibs4support kdnssd ];
}
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
index 9194b45c4015..75420b6600f4 100644
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ b/pkgs/applications/kde/kwalletmanager.nix
@@ -2,7 +2,6 @@
, mkDerivation
, extra-cmake-modules
, kdoctools
-, wrapGAppsHook
, kauth
, kcmutils
, kconfigwidgets
@@ -18,7 +17,7 @@ mkDerivation {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
kxmlgui
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index 169b801b30d9..1217c29032b4 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -1,5 +1,5 @@
{ mkDerivation, lib
-, extra-cmake-modules, kdoctools, wrapGAppsHook
+, extra-cmake-modules, kdoctools
, qtscript, qtsvg, qtquickcontrols, qtwebkit
, krunner, shared_mime_info, kparts, knewstuff
, gpsd, perl
@@ -8,7 +8,7 @@
mkDerivation {
name = "marble";
meta.license = with lib.licenses; [ lgpl21 gpl3 ];
- nativeBuildInputs = [ extra-cmake-modules kdoctools perl wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
propagatedBuildInputs = [
qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts
knewstuff gpsd
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index 350630664d92..deeffa3207b8 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
kconfig, kinit,
kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
}:
@@ -11,9 +11,8 @@ mkDerivation {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ peterhoeg ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
- kconfig kinit
- kcmutils kconfigwidgets knewstuff kparts qca-qt5
+ kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
];
}
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 12983519b26d..8cfd946b810d 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
+ extra-cmake-modules, kdoctools,
djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
@@ -9,12 +9,13 @@
mkDerivation {
name = "okular";
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ djvulibre ebook_tools ];
propagatedBuildInputs = [
- djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
- kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
- kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler
- qca-qt5 qtdeclarative qtsvg threadweaver
+ kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
+ kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio
+ kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler qca-qt5
+ qtdeclarative qtsvg threadweaver
];
meta = {
platforms = lib.platforms.linux;
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index 18a5da2ccca1..085b53de0f39 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -1,6 +1,8 @@
{
- mkDerivation, lib, extra-cmake-modules, wrapGAppsHook,
- cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
+ mkDerivation, lib,
+ extra-cmake-modules,
+ cups, ki18n,
+ kconfig, kconfigwidgets, kdbusaddons, kiconthemes, kcmutils, kio,
knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
qtdeclarative
}:
@@ -11,10 +13,10 @@ mkDerivation {
license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ];
};
- nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules ];
+ buildInputs = [ cups ki18n ];
propagatedBuildInputs = [
- cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
- kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework
- qtdeclarative
+ kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
+ kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative
];
}
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 10d98d99b0bb..7fa18289ae1e 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -1,18 +1,19 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, wrapGAppsHook,
- kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
+ extra-cmake-modules, kdoctools,
+ ki18n, xcb-util-cursor,
+ kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
- xcb-util-cursor
}:
mkDerivation {
name = "spectacle";
meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ ki18n xcb-util-cursor ];
propagatedBuildInputs = [
- kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
- kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
+ kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
+ kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi
];
propagatedUserEnvPkgs = [ kipi-plugins ];
}
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index f3c011e33335..854408e6e3e6 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, qtbase, qtsvg, qtx11extras, makeQtWrapper, muparser, cmake }:
+{ mkDerivation, lib, fetchFromGitHub, qtbase, qtsvg, qtx11extras, muparser, cmake }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "albert-${version}";
version = "0.11.3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0ddz6h1334b9kqy1lfi7qa21znm3l0b9h0d4s62llxdasv103jh5";
};
- nativeBuildInputs = [ cmake makeQtWrapper ];
+ nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase qtsvg qtx11extras muparser ];
@@ -31,11 +31,7 @@ stdenv.mkDerivation rec {
rm "$out/lib"
'';
- fixupPhase = ''
- wrapQtProgram $out/bin/albert
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://albertlauncher.github.io/;
description = "Desktop agnostic launcher";
license = licenses.gpl3Plus;
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index ccdedb23cb0f..48e08be54748 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget,
+{ stdenv, fetchgit, qtbase, qtquick1, qmltermwidget,
qtquickcontrols, qtgraphicaleffects, qmake }:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
- nativeBuildInputs = [ makeQtWrapper qmake ];
+ nativeBuildInputs = [ qmake ];
installFlags = [ "INSTALL_ROOT=$(out)" ];
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
mv $out/usr/share $out/share
mv $out/usr/bin $out/bin
rmdir $out/usr
-
- wrapQtProgram $out/bin/cool-retro-term
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index ff18796e39d6..e33edfb0a440 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, cmake, python3, qtbase, makeQtWrapper, curaengine }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, curaengine }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "cura-${version}";
version = "2.4.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase ];
propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ];
- nativeBuildInputs = [ cmake python3.pkgs.wrapPython makeQtWrapper ];
+ nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
cmakeFlags = [ "-DCMAKE_MODULE_PATH=${python3.pkgs.uranium}/share/cmake-${cmake.majorVersion}/Modules" ];
@@ -24,11 +24,9 @@ stdenv.mkDerivation rec {
postFixup = ''
wrapPythonPrograms
- mv $out/bin/cura $out/bin/.cura-noqtpath
- makeQtWrapper $out/bin/.cura-noqtpath $out/bin/cura
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "3D printer / slicing GUI built on top of the Uranium framework";
homepage = "https://github.com/Ultimaker/Cura";
license = licenses.agpl3;
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 3472af27fea0..358d9dff44a6 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
-, yacc, flex, zlib, config, qmake, makeQtWrapper
+, yacc, flex, zlib, config, qmake, makeWrapper
}:
stdenv.mkDerivation rec {
name = "golden-cheetah-${version}";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz";
sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf";
};
- qtInputs = [
- qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib
+ buildInputs = [
+ qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib
qtconnectivity
];
- nativeBuildInputs = [ makeQtWrapper qmake ] ++ qtInputs;
+ nativeBuildInputs = [ flex makeWrapper qmake yacc ];
preConfigure = ''
cp src/gcconfig.pri.in src/gcconfig.pri
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp src/GoldenCheetah $out/bin
- wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
+ wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
runHook postInstall
'';
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 6d3193089c7f..16147715705e 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, makeQtWrapper }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }:
stdenv.mkDerivation rec {
name = "gpxsee-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
};
- nativeBuildInputs = [ qmake qttools makeQtWrapper ];
+ nativeBuildInputs = [ qmake qttools ];
preConfigure = ''
substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
preFixup = ''
install -Dm755 GPXSee $out/bin/GPXSee
- wrapQtProgram $out/bin/GPXSee
mkdir -p $out/share/gpxsee
cp pkg/maps.txt $out/share/gpxsee
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index 22c9cfc7e986..743a20b6bfc5 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -2,7 +2,6 @@
, lib
, fetchurl
, extra-cmake-modules
-, makeQtWrapper
, kcmutils
, kconfigwidgets
, kdbusaddons
@@ -35,14 +34,7 @@ stdenv.mkDerivation rec {
libXtst
];
- nativeBuildInputs = [
- extra-cmake-modules
- makeQtWrapper
- ];
-
- postInstall = ''
- wrapQtProgram "$out/bin/kdeconnect-cli"
- '';
+ nativeBuildInputs = [ extra-cmake-modules ];
meta = {
description = "KDE Connect provides several features to integrate your phone and your computer";
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index 039b50b133a2..5016acfff124 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, makeQtWrapper, mesa }:
+{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, mesa }:
stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ qtbase vcg glew ];
enableParallelBuilding = true;
- nativeBuildInputs = [ qmake makeQtWrapper ];
+ nativeBuildInputs = [ qmake ];
qmakeFlags = [ "openBrf.pro" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
--set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \
$out/share/openBrf/openBrf
- makeQtWrapper "$out/share/openBrf/openBrf" "$out/bin/openBrf"
+ ln -s "$out/share/openBrf/openBrf" "$out/bin/openBrf"
'';
dontPatchELF = true;
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index d6aea74d9972..671370252a79 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, procps ? null
+{ mkDerivation, stdenv, lib, fetchFromGitHub, procps ? null
, qtbase, qtwebengine, qtwebkit
-, cmake, makeQtWrapper
+, cmake
, syncthing, syncthing-inotify ? null
, preferQWebView ? false }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
version = "0.5.7";
name = "qsyncthingtray-${version}";
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit;
- nativeBuildInputs = [ cmake makeQtWrapper ];
- enableParallelBuilding = true;
+ nativeBuildInputs = [ cmake ];
cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1";
@@ -41,12 +40,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
install -m755 QSyncthingTray $out/bin/${qst}
ln -s $out/bin/${qst} $out/bin/QSyncthingTray
- wrapQtProgram $out/bin/qsyncthingtray
runHook postInstall
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://github.com/sieren/QSyncthingTray/;
description = "A Traybar Application for Syncthing written in C++";
longDescription = ''
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index a12467c55d4f..d300e411c942 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmake }:
+{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
stdenv.mkDerivation rec {
name = "qtpass-${version}";
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
- nativeBuildInputs = [ makeQtWrapper qmake ];
+ nativeBuildInputs = [ makeWrapper qmake ];
preConfigure = ''
- qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out"
+ qmakeFlags="$qmakeFlags DESTDIR=$out"
'';
installPhase = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
- wrapQtProgram $out/bin/qtpass \
+ wrapProgram $out/bin/qtpass \
--suffix PATH : ${git}/bin \
--suffix PATH : ${gnupg}/bin \
--suffix PATH : ${pass}/bin
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index f9ca31eccfe3..0ba850a34607 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchgit, pkgconfig , libssh2
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
, qtsvg, qttools, qtquick1
-, makeQtWrapper, qmake
+, qmake
}:
let
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
};
- nativeBuildInputs = [ makeQtWrapper qmake ];
+ nativeBuildInputs = [ qmake ];
buildInputs = [
pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
@@ -68,7 +68,6 @@ EOF
mkdir -p $out/bin
instdir="$srcdir/bin/linux/release"
cp $instdir/rdm $out/bin
- wrapQtProgram $out/bin/rdm
'';
meta = with lib; {
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 09da875e2360..80ecbdeba77f 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, which, makeQtWrapper,
- libtool, openssl, qtbase, qttools }:
+{ mkDerivation, lib, fetchurl, pkgconfig, which
+, libtool, openssl, qtbase, qttools }:
-with stdenv.lib;
+with lib;
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "xca-${version}";
version = "1.3.2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libtool openssl qtbase qttools ];
- nativeBuildInputs = [ makeQtWrapper pkgconfig which ];
+ nativeBuildInputs = [ pkgconfig which ];
configureFlags = [ "CXXFLAGS=-std=c++11" ];
@@ -26,12 +26,7 @@ stdenv.mkDerivation rec {
--replace ${qtbase}/bin/uic ${qtbase.dev}/bin/uic
'';
- postInstall = ''
- wrapQtProgram "$out/bin/xca"
- wrapQtProgram "$out/bin/xca_db_stat"
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Interface for managing asymetric keys like RSA or DSA";
homepage = http://xca.sourceforge.net/;
platforms = platforms.all;
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index a8c49b9fd4ad..614473d39eec 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook
+{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeWrapper, wrapGAppsHook
, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav
@@ -44,7 +44,7 @@ in buildPythonApplication rec {
];
nativeBuildInputs = [
- makeQtWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
+ makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
];
propagatedBuildInputs = [
@@ -73,9 +73,8 @@ in buildPythonApplication rec {
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
'';
- postFixup = ''
- wrapQtProgram $out/bin/qutebrowser \
- ${lib.optionalString withWebEngineDefault ''--add-flags "--backend webengine"''}
+ postFixup = lib.optionalString withWebEngineDefault ''
+ wrapProgram $out/bin/qutebrowser --add-flags "--backend webengine"
'';
meta = {
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 12ed28979d29..cda86d2e6524 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, makeDesktopItem, patchelf, makeWrapper, makeQtWrapper
+{ mkDerivation, stdenv, lib, fetchurl, makeDesktopItem
+, makeWrapper, patchelf
, dbus_libs, fontconfig, freetype, gcc, glib
, libdrm, libffi, libICE, libSM
, libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
@@ -58,7 +59,7 @@ let
startupNotify = "false";
};
-in stdenv.mkDerivation {
+in mkDerivation {
name = "dropbox-${version}";
src = fetchurl {
name = "dropbox-${version}.tar.gz";
@@ -68,7 +69,7 @@ in stdenv.mkDerivation {
sourceRoot = ".dropbox-dist";
- nativeBuildInputs = [ makeQtWrapper patchelf ];
+ nativeBuildInputs = [ makeWrapper patchelf ];
dontStrip = true; # already done
installPhase = ''
@@ -94,7 +95,7 @@ in stdenv.mkDerivation {
mkdir -p "$out/bin"
RPATH="${ldpath}:$out/${appdir}"
- makeQtWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
+ makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
--prefix LD_LIBRARY_PATH : "$RPATH"
chmod 755 $out/${appdir}/dropbox
@@ -137,8 +138,8 @@ in stdenv.mkDerivation {
meta = {
homepage = "http://www.dropbox.com";
description = "Online stored folders (daemon version)";
- maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+ maintainers = with lib.maintainers; [ ttuegel ];
platforms = [ "i686-linux" "x86_64-linux" ];
- license = stdenv.lib.licenses.unfree;
+ license = lib.licenses.unfree;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index d1773456df2e..2c6cf473f1c4 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, openal, opencv,
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, openal, opencv,
libtoxcore, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, xorg,
- pango, atk, qrencode, ffmpeg, filter-audio, makeQtWrapper,
+ pango, atk, qrencode, ffmpeg, filter-audio,
qtbase, qtsvg, qttools, qttranslations, sqlcipher,
libvpx, libopus }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "qtox-${version}";
version = "1.10.2";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
libpthreadstubs libXdmcp
]);
- nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig ];
cmakeFlags = [
"-DGIT_DESCRIBE=${version}"
@@ -35,14 +35,11 @@ stdenv.mkDerivation rec {
runHook preInstall
install -Dm755 qtox $out/bin/qtox
- wrapQtProgram $out/bin/qtox
runHook postInstall
'';
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Qt Tox client";
license = licenses.gpl3;
maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ];
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 781a4a18b9cc..03fc0d85292a 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, qtbase, qtquickcontrols, cmake, makeQtWrapper }:
+{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, cmake }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "quaternion-git-${version}";
version = "2017-04-15";
@@ -18,25 +18,21 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
- enableParallelBuilding = true;
-
buildInputs = [ qtbase qtquickcontrols ];
- nativeBuildInputs = [ cmake makeQtWrapper ];
+ nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-Wno-dev"
];
postInstall = ''
- wrapQtProgram $out/bin/quaternion
-
substituteInPlace $out/share/applications/quaternion.desktop \
--replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
rm $out/share/icons/hicolor/icon-theme.cache
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://matrix.org/docs/projects/client/quaternion.html;
description = "Cross-platform desktop IM client for the Matrix protocol";
license = licenses.gpl3;
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index b7566e0be4b0..b1dd7a4c90f3 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
-, qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols
+, qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols
, openssl, protobuf, qmake
}:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
openssl protobuf
];
- nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
+ nativeBuildInputs = [ pkgconfig qmake ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)"
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp ricochet $out/bin
- wrapQtProgram $out/bin/ricochet
mkdir -p $out/share/applications
cp $desktopItem/share/applications"/"* $out/share/applications
diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index c61c62dc8ba4..67d1f55f2fe0 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -3,7 +3,7 @@
, qtimageformats, qtgraphicaleffects, qtwebkit
, telegram-qml, libqtelegram-aseman-edition
, gst_all_1
-, makeQtWrapper, qmake }:
+, makeWrapper, qmake }:
stdenv.mkDerivation rec {
name = "cutegram-${meta.version}";
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- nativeBuildInputs = [ makeQtWrapper qmake ];
+ nativeBuildInputs = [ makeWrapper qmake ];
fixupPhase = ''
- wrapQtProgram $out/bin/cutegram \
+ wrapProgram $out/bin/cutegram \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index d64b5be816aa..0af0c0b1d1ba 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
-, qtbase, qtimageformats, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
+, qtbase, qtimageformats
, breakpad, gtk3, libappindicator-gtk3, dee
, ffmpeg, openalSoft, minizip
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "telegram-desktop-${version}";
version = "1.0.27";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip
];
- nativeBuildInputs = [ pkgconfig gyp cmake makeQtWrapper ];
+ nativeBuildInputs = [ pkgconfig gyp cmake ];
patches = [ "${tgaur}/aur-build-fixes.patch" ];
@@ -86,10 +86,9 @@ stdenv.mkDerivation rec {
for icon_size in 16 32 48 64 128 256 512; do
install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
done
- wrapQtProgram $out/bin/telegram-desktop
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Telegram Desktop messaging app";
license = licenses.gpl3;
platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index d602e887f264..0571946061bc 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeQtWrapper, makeDesktopItem }:
+{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
stdenv.mkDerivation rec {
name = "tensor-git-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ qtbase qtquickcontrols ];
- nativeBuildInputs = [ qmake makeQtWrapper ];
+ nativeBuildInputs = [ qmake ];
desktopItem = makeDesktopItem {
name = "tensor";
@@ -36,8 +36,6 @@ stdenv.mkDerivation rec {
install -Dm644 ${desktopItem}/share/applications/tensor.desktop \
$out/share/applications/tensor.desktop
- wrapQtProgram $out/bin/tensor
-
substituteInPlace $out/share/applications/tensor.desktop \
--subst-var-by bin $out/bin/tensor
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index 7b4d52b73c20..9bfdd8408dac 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, libcommuni, makeQtWrapper, qtbase, qmake, stdenv }:
+{ fetchgit, libcommuni, qtbase, qmake, stdenv }:
stdenv.mkDerivation rec {
name = "communi-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
- nativeBuildInputs = [ makeQtWrapper qmake ];
+ nativeBuildInputs = [ qmake ];
buildInputs = [ libcommuni qtbase ];
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
- wrapQtProgram "$out/bin/communi"
substituteInPlace "$out/share/applications/communi.desktop" \
--replace "/usr/bin" "$out/bin"
'';
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 26e5911a85f3..4cfde1f9b078 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -3,7 +3,6 @@
, fetchurl
, extra-cmake-modules
, kdoctools
-, wrapGAppsHook
, kbookmarks
, karchive
, kconfig
@@ -21,7 +20,6 @@
, kio
, kparts
, kwallet
-, makeQtWrapper
, solid
, sonnet
, phonon
@@ -65,7 +63,6 @@ in mkDerivation rec {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
- wrapGAppsHook
];
meta = {
diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix
index fa6e4db0a0d2..26cb9e40a263 100644
--- a/pkgs/applications/networking/mailreaders/trojita/default.nix
+++ b/pkgs/applications/networking/mailreaders/trojita/default.nix
@@ -1,13 +1,12 @@
-{ stdenv
+{ mkDerivation
, lib
, fetchgit
, cmake
, qtbase
, qtwebkit
-, makeQtWrapper
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "trojita-${version}";
version = "0.7";
@@ -18,25 +17,20 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- cmake
qtbase
qtwebkit
];
nativeBuildInputs = [
- makeQtWrapper
+ cmake
];
- postInstall = ''
- wrapQtProgram "$out/bin/trojita"
- '';
-
- meta = {
+ meta = with lib; {
description = "A Qt IMAP e-mail client";
homepage = http://trojita.flaska.net/;
- license = with lib.licenses; [ gpl2 gpl3 ];
- platforms = stdenv.lib.platforms.linux;
+ license = with licenses; [ gpl2 gpl3 ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index f08759514c3a..696681dce277 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -70,7 +70,7 @@ let
client = source: generic {
type = "mumble";
- nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools qt5.makeQtWrapper ];
+ nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools ];
buildInputs = [ libopus libsndfile speex ]
++ optional (source.qtVersion == 5) qt5.qtsvg
++ optional stdenv.isLinux alsaLib
@@ -91,10 +91,6 @@ let
mkdir -p $out/share/icons{,/hicolor/scalable/apps}
cp icons/mumble.svg $out/share/icons
ln -s $out/share/icon/mumble.svg $out/share/icons/hicolor/scalable/apps
-
- ${optionalString (source.qtVersion == 5) ''
- wrapQtProgram $out/bin/mumble
- ''}
'';
} source;
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 21a55c4136c7..4bf571a93d83 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, makeQtWrapper, pkgconfig, sqlite }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, pkgconfig, sqlite }:
stdenv.mkDerivation rec {
name = "quiterss-${version}";
@@ -11,13 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1y0n5ps1z4wgf9hkfjrw7dfyncrw22bf9mi3052vmf3s7xzz6vbb";
};
- nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+ nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [ qtbase qttools qtwebkit sqlite.dev ];
- postInstall = ''
- wrapQtProgram "$out/bin/quiterss"
- '';
-
meta = with stdenv.lib; {
description = "A Qt-based RSS/Atom news feed reader";
longDescription = ''
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 95286f3ab650..7178a0930e77 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -1,4 +1,5 @@
{ fetchurl, stdenv, dpkg, which
+, makeWrapper
, alsaLib
, desktop_file_utils
, dbus
@@ -92,7 +93,7 @@ stdenv.mkDerivation {
sha256 = sha256;
};
- nativeBuildInputs = [ qt5.makeQtWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
buildInputs = [ dpkg which ] ++ deps;
unpackPhase = "true";
@@ -107,7 +108,7 @@ stdenv.mkDerivation {
$out/bin/mendeleydesktop
paxmark m $out/bin/mendeleydesktop
- wrapQtProgram $out/bin/mendeleydesktop \
+ wrapProgram $out/bin/mendeleydesktop \
--add-flags "--unix-distro-build" \
${stdenv.lib.optionalString autorunLinkHandler
''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop"''}
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index be70cb89d6f3..9f54f2df6bf2 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmake, makeQtWrapper, qtsvg }:
+{ stdenv, fetchurl, qmake, qtsvg }:
let
version = "1.42.2";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804";
};
- nativeBuildInputs = [ makeQtWrapper qmake ];
+ nativeBuildInputs = [ qmake ];
buildInputs = [ qtsvg ];
hardeningDisable = [ "format" ];
@@ -23,8 +23,6 @@ in stdenv.mkDerivation rec {
--replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png"
'';
- postInstall = "wrapQtProgram $out/bin/mytetra";
-
meta = with stdenv.lib; {
description = "Smart manager for information collecting";
homepage = http://webhamster.ru/site/page/index/articles/projectcode/138;
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index acf60bd03755..38ec107bcf73 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper, qtwebkit, qtscript, grantlee,
+{ mkDerivation, lib, fetchurl,
+ cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee,
kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities,
knotifyconfig, krunner, libofx }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "skrooge-${version}";
version = "2.7.0";
@@ -12,21 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
};
- nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
+ nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
kdelibs4support kactivities knotifyconfig krunner libofx
];
- enableParallelBuilding = true;
-
- postInstall = ''
- wrapQtProgram "$out/bin/skrooge"
- wrapQtProgram "$out/bin/skroogeconvert"
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A personal finances manager, powered by KDE";
license = with licenses; [ gpl3 ];
maintainers = with maintainers; [ joko ];
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 49c774f7039a..da6aa38d746a 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
-, qtscript, qtserialport, qttools, makeQtWrapper
+{ mkDerivation, lib, fetchurl
+, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
+, qtscript, qtserialport, qttools
, qtmultimedia
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "stellarium-${version}";
version = "0.15.0";
@@ -12,25 +13,19 @@ stdenv.mkDerivation rec {
sha256 = "0il751lgnfkx35h1m8fzwwnrygpxjx2a80gng1i1rbybkykf7l3l";
};
- nativeBuildInputs = [ makeQtWrapper ];
+ nativeBuildInputs = [ cmake perl ];
buildInputs = [
- cmake freetype libpng mesa gettext openssl perl libiconv qtscript
- qtserialport qttools qtmultimedia
+ freetype libpng mesa openssl libiconv qtscript qtserialport qttools
+ qtmultimedia
];
- enableParallelBuilding = true;
-
- postInstall = ''
- wrapQtProgram "$out/bin/stellarium"
- '';
-
- meta = {
+ meta = with lib; {
description = "Free open-source planetarium";
homepage = "http://stellarium.org/";
- license = stdenv.lib.licenses.gpl2;
+ license = licenses.gpl2;
- platforms = stdenv.lib.platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin
- maintainers = [ stdenv.lib.maintainers.peti ];
+ platforms = platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin
+ maintainers = [ maintainers.peti ];
};
}
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index b978e644a8ec..ab5088543102 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmake, pkgconfig
+{ stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig
, qtbase, qtsvg, qtserialport, boost, libgit2
}:
@@ -28,20 +28,14 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
- nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
+ nativeBuildInputs = [ qmake pkgconfig ];
qmakeFlags = [ "phoenix.pro" ];
- enableParallelBuilding = true;
-
preConfigure = ''
ln -s "$parts" parts
'';
- postInstall = ''
- wrapQtProgram $out/bin/Fritzing
- '';
-
meta = {
description = "An open source prototyping tool for Arduino-based projects";
homepage = http://fritzing.org/;
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index 861deaff741c..d36b135531c2 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, cmake, makeQtWrapper, qtbase, qttools }:
+{ mkDerivation, lib, fetchgit, cmake, qtbase, qttools }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "speedcrunch-${version}";
version = "0.12.0";
@@ -11,21 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk";
};
- enableParallelBuilding = true;
-
buildInputs = [ qtbase qttools ];
- nativeBuildInputs = [ cmake makeQtWrapper ];
+ nativeBuildInputs = [ cmake ];
preConfigure = ''
cd src
'';
- postFixup = ''
- wrapQtProgram $out/bin/speedcrunch
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://speedcrunch.org;
license = licenses.gpl2Plus;
description = "A fast power user calculator";
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index a4a08deb8e2d..98ec39eb2064 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake
, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake
-, makeQtWrapper, lndir
+, makeWrapper, lndir
, gst_all_1, qt-gstreamer1, pkgconfig, glibc
, version ? "2.9.4"
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs;
- nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
+ nativeBuildInputs = [ pkgconfig makeWrapper qmake ];
patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ];
postPatch = ''
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
postInstall = ''
- wrapQtProgram "$out/bin/qgroundcontrol" \
+ wrapProgram "$out/bin/qgroundcontrol" \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
'';
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index 0995052cfc1e..bffb038f6536 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which, makeQtWrapper
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which
, libX11, libxcb, mesa
-, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
+, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper
, libchardet
, ffmpeg
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
- wrapQtProgram $out/bin/bomi \
+ wrapProgram $out/bin/bomi \
${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
'';
@@ -104,9 +104,7 @@ stdenv.mkDerivation rec {
++ optional cddaSupport "--enable-cdda"
;
- nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmake ];
-
- enableParallelBuilding = true;
+ nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ];
meta = with stdenv.lib; {
description = "Powerful and easy-to-use multimedia player";
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 656ec1163dc2..f67ab412c26e 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, doxygen, python3Packages, libopenshot
-, makeQtWrapper, wrapGAppsHook, gtk3 }:
+, wrapGAppsHook, gtk3 }:
python3Packages.buildPythonApplication rec {
name = "openshot-qt-${version}";
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index d9a38d88f95e..4ca31916965c 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols,
qtgraphicaleffects,
-qmake, makeQtWrapper }:
+qmake, makeWrapper }:
stdenv.mkDerivation rec {
name = "shotcut-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+ nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
buildInputs = [
SDL frei0r gettext mlt
qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/shotcut
cp -r src/qml $out/share/shotcut/
- wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin
+ wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 7e05324a046b..783a424e18c2 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
-, qtbase, qtmultimedia, qtsvg, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
+, qtbase, qtmultimedia, qtsvg
, lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "virt-manager-qt-${version}";
version = "0.43.70.2";
@@ -23,17 +23,9 @@ stdenv.mkDerivation rec {
libvirt libvncserver pixman spice_gtk spice_protocol
];
- nativeBuildInputs = [ cmake pkgconfig makeQtWrapper ];
+ nativeBuildInputs = [ cmake pkgconfig ];
- postFixup = ''
- for f in $out/bin/* ; do
- wrapQtProgram $f
- done
- '';
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://f1ash.github.io/qt-virt-manager;
description = "Desktop user interface for managing virtual machines (QT)";
longDescription = ''
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6c49e95b6b94..32e8f9d23f4b 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio
++ optionals (headless) [ libXrandr ]
- ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras qt5.makeQtWrapper libXinerama SDL ];
+ ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
hardeningDisable = [ "fortify" "pic" "stackprotector" ];
@@ -153,12 +153,8 @@ in stdenv.mkDerivation {
find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \
-name src -o -exec cp -avt "$libexec" {} +
- # Create wrapper script
mkdir -p $out/bin
- ${optionalString (!headless) ''
- makeQtWrapper "$libexec/VirtualBox" $out/bin/VirtualBox
- ''}
- for file in ${optionalString (!headless) "VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
+ for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
echo "Linking $file to /bin"
test -x "$libexec/$file"
ln -s "$libexec/$file" $out/bin/$file
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index 5ada154f77d4..10fc7a3a5b71 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, extra-cmake-modules, kdoctools, makeQtWrapper,
+ mkDerivation, extra-cmake-modules, kdoctools,
kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2
}:
diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index 7b421f4ca365..a79e6d903842 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, lib, fetchFromGitHub, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, extra-cmake-modules
, qtbase, qtmultimedia, qtquick1, qttools
, mesa, libX11
, libass, openal, ffmpeg, libuchardet
, alsaLib, libpulseaudio, libva
}:
-with stdenv.lib;
+with lib;
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "libqtav-${version}";
# Awaiting upcoming `v1.12.0` release. `v1.11.0` is not supporting cmake which is the
# the reason behind taking an unstable git rev.
version = "unstable-2017-03-30";
- nativeBuildInputs = [ extra-cmake-modules makeQtWrapper qttools ];
+ nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [
qtbase qtmultimedia qtquick1
mesa libX11
@@ -45,12 +45,6 @@ stdenv.mkDerivation rec {
cp -a "./bin/"* "$out/bin"
'';
- postFixup = ''
- for i in `find $out/bin -maxdepth 1 -xtype f -executable`; do
- wrapQtProgram "$i"
- done
- '';
-
meta = {
description = "A multimedia playback framework based on Qt + FFmpeg.";
#license = licenses.lgpl21; # For the libraries / headers only.
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 37065edc440d..7996a316bdb6 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -146,11 +146,6 @@ let
qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras qtxmlpatterns
];
- makeQtWrapper =
- makeSetupHook
- { deps = [ makeWrapper ]; }
- (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
-
qmake = makeSetupHook {
deps = [ self.qtbase.dev ];
substitutions = { inherit (stdenv) isDarwin; };
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 1000bf09b17f..b7d141fd5a2b 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -133,12 +133,6 @@ let
] ++ optional (!stdenv.isDarwin) qtwayland
++ optional (stdenv.isDarwin) qtmacextras);
- makeQtWrapper =
- makeSetupHook
- { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; }
- (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
-
-
qmake = makeSetupHook {
deps = [ self.qtbase.dev ];
substitutions = { inherit (stdenv) isDarwin; };
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
index 28ea571adca0..6f2ff593f1e7 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
+{ stdenv, qtSubmodule, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
with stdenv.lib;
@@ -6,17 +6,9 @@ qtSubmodule {
name = "qtdeclarative";
patches = copyPathsToStore (readPathsFromFile ./. ./series);
qtInputs = [ qtbase qtsvg qtxmlpatterns ];
- nativeBuildInputs = [ python2 makeQtWrapper ];
+ nativeBuildInputs = [ python2 ];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
'';
-
- postInstall = ''
- wrapQtProgram $out/bin/qmleasing
- wrapQtProgram $out/bin/qmlscene
- wrapQtProgram $out/bin/qmltestrunner
- '' + optionalString (stdenv.isDarwin) ''
- wrapQtProgram $out/bin/qml.app/Contents/MacOS/qml
- '';
}
diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
index 6b97c2d85cd2..6fa5390855d0 100644
--- a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
@@ -1,28 +1,14 @@
-{ stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, qtbase }:
+{ stdenv, qtSubmodule, copyPathsToStore, qtbase }:
with stdenv.lib;
qtSubmodule {
name = "qttools";
qtInputs = [ qtbase ];
- nativeBuildInputs = [ makeQtWrapper ];
patches = copyPathsToStore (readPathsFromFile ./. ./series);
postFixup = ''
moveToOutput "bin/qdbus" "$out"
moveToOutput "bin/qtpaths" "$out"
'';
-
- postInstall = ''
- wrapQtProgram $out/bin/qcollectiongenerator
- wrapQtProgram $out/bin/qhelpconverter
- wrapQtProgram $out/bin/qhelpgenerator
- wrapQtProgram $out/bin/qtdiag
- '' + optionalString (stdenv.isDarwin) ''
- wrapQtProgram $out/bin/Assistant.app/Contents/MacOS/Assistant
- wrapQtProgram $out/bin/Designer.app/Contents/MacOS/Designer
- wrapQtProgram $out/bin/Linguist.app/Contents/MacOS/Linguist
- wrapQtProgram $out/bin/pixeltool.app/Contents/MacOS/pixeltool
- wrapQtProgram $out/bin/qdbusviewer.app/Contents/MacOS/qdbusviewer
- '';
}
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
deleted file mode 100644
index a42c418fde66..000000000000
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-wrapQtProgram() {
- local prog="$1"
- shift
- wrapProgram "$prog" \
- --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
- --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
- --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \
- --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
- --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
- "$@"
-}
-
-makeQtWrapper() {
- local old="$1"
- local new="$2"
- shift
- shift
- makeWrapper "$old" "$new" \
- --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
- --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
- --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \
- --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
- --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
- "$@"
-}
-
-_makeQtWrapperSetup() {
- # cannot use addToSearchPath because these directories may not exist yet
- export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/$qtPluginPrefix"
- export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/$qtQmlPrefix"
- export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share"
- export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
-}
-
-prePhases+=(_makeQtWrapperSetup)
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
deleted file mode 100644
index 33dc8b6370fc..000000000000
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-wrapQtProgram() {
- local prog="$1"
- shift
- wrapProgram "$prog" \
- --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
- --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
- --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
- --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
- --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \
- "$@"
-}
-
-makeQtWrapper() {
- local old="$1"
- local new="$2"
- shift
- shift
- makeWrapper "$old" "$new" \
- --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
- --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
- --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
- --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
- --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \
- "$@"
-}
-
-_makeQtWrapperSetup() {
- # cannot use addToSearchPath because these directories may not exist yet
- export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/$qtPluginPrefix"
- export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/$qtQmlPrefix"
- export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share${GSETTINGS_SCHEMAS_PATH:+:$GSETTINGS_SCHEMAS_PATH}"
- export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
-}
-
-prePhases+=(_makeQtWrapperSetup)
-
-_findGioModules() {
- if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
- export GIO_EXTRA_MODULES="$GIO_EXTRA_MODULES${GIO_EXTRA_MODULES:+:}$1/lib/gio/modules"
- fi
-}
-
-envHooks+=(_findGioModules)
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index df6a7fa5a159..ff4341c6783a 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper
-, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmake
+, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake
, withDocumentation ? false
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
- nativeBuildInputs = [ qmake makeQtWrapper makeWrapper ];
+ nativeBuildInputs = [ qmake makeWrapper ];
doCheck = true;
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
postInstall = ''
substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \
--replace "Exec=qtcreator" "Exec=$out/bin/qtcreator"
- wrapQtProgram $out/bin/qtcreator
'';
meta = {
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 7caac253435e..395f720906c9 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qmake, makeQtWrapper, qtbase, perl, python, php }:
+{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php }:
stdenv.mkDerivation rec {
name = "qcachegrind-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase perl python php ];
- nativeBuildInputs = [ qmake makeQtWrapper ];
+ nativeBuildInputs = [ qmake ];
postInstall = ''
mkdir -p $out/bin
@@ -25,10 +25,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/Applications
cp cgview/cgview.app/Contents/MacOS/cgview $out/bin
cp -a qcachegrind/qcachegrind.app $out/Applications
- wrapQtProgram $out/Applications/qcachegrind.app/Contents/MacOS/qcachegrind
'' else ''
install qcachegrind/qcachegrind cgview/cgview -t "$out/bin"
- wrapQtProgram "$out/bin/qcachegrind"
install -Dm644 qcachegrind/qcachegrind.desktop -t "$out/share/applications"
install -Dm644 kcachegrind/hi32-app-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png"
install -Dm644 kcachegrind/hi48-app-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png"
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 28c618c29a0e..a43d3928980e 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, qtbase, qttools, makeQtWrapper, sqlite, cmake }:
+{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
version = "3.9.1";
name = "sqlitebrowser-${version}";
@@ -12,23 +12,17 @@ stdenv.mkDerivation rec {
};
buildInputs = [ qtbase qttools sqlite ];
- nativeBuildInputs = [ makeQtWrapper cmake ];
-
- enableParallelBuilding = true;
-
+ nativeBuildInputs = [ cmake ];
+
cmakeFlags = [ "-DUSE_QT5=TRUE" ];
-
+
# A regression was introduced in CMakeLists.txt on v3.9.x
# See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755
postPatch = ''
substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)'
'';
- postInstall = ''
- wrapQtProgram $out/bin/sqlitebrowser
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "DB Browser for SQLite";
homepage = "http://sqlitebrowser.org/";
license = licenses.gpl3;
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 350cda4e2630..578e759548a1 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
, boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }:
let
qscintillaLib = (qscintilla.override { withQt5 = true; });
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
name = "tora-${version}";
version = "3.1";
@@ -15,10 +15,8 @@ in stdenv.mkDerivation rec {
sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7";
};
- enableParallelBuilding = true;
-
+ nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];
buildInputs = [
- cmake extra-cmake-modules makeQtWrapper
boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase
];
@@ -54,11 +52,11 @@ in stdenv.mkDerivation rec {
];
postFixup = ''
- wrapQtProgram $out/bin/tora \
+ wrapProgram $out/bin/tora \
--prefix PATH : ${lib.getBin graphviz}/bin
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Tora SQL tool";
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
index 56f15d62154c..e351a75db4b2 100644
--- a/pkgs/development/tools/vogl/default.nix
+++ b/pkgs/development/tools/vogl/default.nix
@@ -1,11 +1,12 @@
-{ fetchFromGitHub, stdenv
+{ mkDerivation, lib, fetchFromGitHub
, cmake, git, pkgconfig, wget, zip
-, makeQtWrapper, qtbase, qtx11extras
+, qtbase, qtx11extras
, libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
, SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
, freeglut, mesa_glu
}:
-stdenv.mkDerivation rec {
+
+mkDerivation rec {
name = "vogl-${version}";
version = "2016-05-13";
@@ -16,9 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n";
};
- nativeBuildInputs = [
- cmake makeQtWrapper pkgconfig
- ];
+ nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
git wget zip
@@ -28,16 +27,17 @@ stdenv.mkDerivation rec {
freeglut mesa_glu
];
- enableParallelBuilding = true;
-
dontUseCmakeBuildDir = true;
preConfigure = ''
cmakeDir=$PWD
mkdir -p vogl/vogl_build/release64 && cd $_
'';
- cmakeFlags = '' -DCMAKE_VERBOSE=On -DCMAKE_BUILD_TYPE=Release -DBUILD_X64=On'';
+ cmakeFlags = [
+ "-DCMAKE_VERBOSE=On"
+ "-DBUILD_X64=On"
+ ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "OpenGL capture / playback debugger.";
homepage = https://github.com/ValveSoftware/vogl;
license = licenses.mit;
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index c0e065b3b555..622bf4fbd5cc 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, perl, makeQtWrapper
+{ stdenv, lib, fetchurl, pkgconfig, perl
, libjpeg, udev
, withUtils ? true
, withGUI ? true, alsaLib, libX11, qtbase, mesa_glu
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h"
'';
- nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional (withUtils && withGUI) makeQtWrapper;
+ nativeBuildInputs = [ pkgconfig perl ];
buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ];
@@ -41,10 +41,6 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
- postInstall = lib.optionalString (withUtils && withGUI) ''
- wrapQtProgram $out/bin/qv4l2
- '';
-
meta = with stdenv.lib; {
description = "V4L utils and libv4l, provide common image formats regardless of the v4l device";
homepage = http://linuxtv.org/projects.php;
diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
index 3456f0986488..d86a0b09c269 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchurl, cmake, alsaLib, udev, qtbase,
- qtsvg, qttools, makeQtWrapper }:
+{ mkDerivation, lib, fetchurl, cmake, alsaLib, udev, qtbase, qtsvg, qttools }:
let
version = "0.21.0";
in
-stdenv.mkDerivation {
+mkDerivation {
name = "qastools-${version}";
src = fetchurl {
@@ -14,15 +13,15 @@ stdenv.mkDerivation {
};
buildInputs = [
- cmake alsaLib udev qtbase qtsvg qttools makeQtWrapper
+ alsaLib udev qtbase qtsvg qttools
];
+ nativeBuildInputs = [ cmake ];
cmakeFlags = [
- "-DCMAKE_INSALL_PREFIX=$out"
"-DALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h"
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Collection of desktop applications for ALSA configuration";
license = licenses.gpl3;
platforms = platforms.linux;
diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index 02d65597f749..ee0accac2d9b 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, makeQtWrapper, xorg, fetchFromGitHub }:
+{ mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "antimicro-${version}";
version = "2.23";
@@ -11,15 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v";
};
+ nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
- cmake pkgconfig SDL2 qtbase qttools xorg.libXtst makeQtWrapper
+ SDL2 qtbase qttools xorg.libXtst
];
- postInstall = ''
- wrapQtProgram $out/bin/antimicro
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "GUI for mapping keyboard and mouse controls to a gamepad";
inherit (src.meta) homepage;
maintainers = with maintainers; [ jb55 ];
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index dce2392cc7b2..86750518bb5a 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake, makeQtWrapper }:
+{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
stdenv.mkDerivation rec {
name = "qt5ct-${version}";
@@ -18,10 +18,6 @@ stdenv.mkDerivation rec {
qmakeFlags="$qmakeFlags PLUGINDIR=$out/$qtPluginPrefix"
'';
- preFixup = ''
- wrapQtProgram $out/bin/qt5ct
- '';
-
meta = with stdenv.lib; {
description = "Qt5 Configuration Tool";
homepage = https://www.opendesktop.org/content/show.php?content=168066;
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index f07e1d4adc7f..63f32763f223 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, qtbase, qmake, makeQtWrapper, libXrandr }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, libXrandr }:
stdenv.mkDerivation rec {
name = "radeon-profile-${version}";
version = "20161221";
- nativeBuildInputs = [ qmake makeQtWrapper ];
+ nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase libXrandr ];
src = (fetchFromGitHub {
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/bin
cp ./radeon-profile $out/bin/radeon-profile
- wrapQtProgram $out/bin/radeon-profile
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index 0538dd79508e..f84b9563967f 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libusb1
-, qtbase, qttools, makeQtWrapper, qmake
+, qtbase, qttools, makeWrapper, qmake
, withEspeak ? false, espeak ? null }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libusb1 qtbase qttools ]
++ stdenv.lib.optional withEspeak espeak;
- nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+ nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
preConfigure = ''
cd rbutil/rbutilqt
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
install -Dm755 RockboxUtility $out/bin/rockboxutility
ln -s $out/bin/rockboxutility $out/bin/RockboxUtility
- wrapQtProgram $out/bin/rockboxutility \
+ wrapProgram $out/bin/rockboxutility \
${stdenv.lib.optionalString withEspeak ''
--prefix PATH : ${espeak}/bin
''}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13ec940b1c91..68a1c2d29ea9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14620,10 +14620,10 @@ with pkgs;
recurseIntoAttrs (makeOverridable mkApplications attrs);
inherit (kdeApplications)
- akonadi ark dolphin ffmpegthumbs filelight gwenview kate
- kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig
- kolourpaint konsole krfb marble
- okteta okular spectacle;
+ akonadi ark dolphin ffmpegthumbs filelight gwenview kate kdenlive
+ kcachegrind kcalc kcolorchooser kcontacts kdf kgpg khelpcenter kig kmix
+ kolourpaint kompare konsole krfb kwalletmanager marble okteta okular
+ spectacle;
kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };