From 4f2e7a0424a51f7462f219fa5691be1d3ae6a082 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 25 Feb 2017 09:44:01 -0600 Subject: [PATCH] Separate Qt 5 packages from dependent libraries --- pkgs/applications/editors/kile/default.nix | 82 ++++-- pkgs/applications/editors/kile/frameworks.nix | 68 ----- .../libraries/kde-frameworks/default.nix | 5 +- pkgs/development/libraries/phonon/default.nix | 4 +- .../libraries/qt-5/5.5/default.nix | 30 +- .../libraries/qt-5/5.6/default.nix | 29 +- .../libraries/qt-5/5.7/default.nix | 30 +- pkgs/development/libraries/quazip/default.nix | 4 +- pkgs/tools/misc/colord-kde/default.nix | 4 +- pkgs/top-level/aliases.nix | 16 +- pkgs/top-level/all-packages.nix | 277 ++++++++++-------- 11 files changed, 272 insertions(+), 277 deletions(-) delete mode 100644 pkgs/applications/editors/kile/frameworks.nix diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 7f7b22dfa134..ad3300b9221f 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,28 +1,68 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, shared_mime_info, kdelibs +{ kdeDerivation +, lib +, fetchgit +, ecm +, kdoctools +, kdeWrapper +, qtscript +, kconfig +, kcrash +, kdbusaddons +, kdelibs4support +, kguiaddons +, kiconthemes +, kinit +, khtml +, konsole +, kparts +, ktexteditor +, kwindowsystem +, poppler }: -stdenv.mkDerivation rec { - name = "kile-2.1.3"; +let + unwrapped = + kdeDerivation rec { + name = "kile-${version}"; + version = "2017-02-09"; - src = fetchurl { - url = "mirror://sourceforge/kile/${name}.tar.bz2"; - sha256 = "18nfi37s46v9xav7vyki3phasddgcy4m7nywzxis198vr97yqqx0"; - }; + src = fetchgit { + url = git://anongit.kde.org/kile.git; + rev = "f77f6e627487c152f111e307ad6dc71699ade746"; + sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib"; - nativeBuildInputs = [ - automoc4 cmake gettext perl pkgconfig shared_mime_info - ]; - buildInputs = [ kdelibs ]; + }; - # for KDE 4.7 the nl translations fail since kile-2.1.2 - preConfigure = "rm -r translations/nl"; + nativeBuildInputs = [ ecm kdoctools ]; - meta = { - description = "An integrated LaTeX editor for KDE"; - homepage = http://kile.sourceforge.net; - maintainers = [ stdenv.lib.maintainers.urkud ]; - license = stdenv.lib.licenses.gpl2Plus; - inherit (kdelibs.meta) platforms; - }; + buildInputs = [ + kconfig + kcrash + kdbusaddons + kdelibs4support + kdoctools + kguiaddons + kiconthemes + kinit + khtml + kparts + ktexteditor + kwindowsystem + poppler + qtscript + ]; + + meta = { + description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment"; + homepage = https://www.kde.org/applications/office/kile/; + maintainers = with lib.maintainers; [ fridh ]; + license = lib.licenses.gpl2Plus; + }; + }; +in +kdeWrapper +{ + inherit unwrapped; + targets = [ "bin/kile" ]; + paths = [ konsole.unwrapped ]; } diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix deleted file mode 100644 index ad3300b9221f..000000000000 --- a/pkgs/applications/editors/kile/frameworks.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ kdeDerivation -, lib -, fetchgit -, ecm -, kdoctools -, kdeWrapper -, qtscript -, kconfig -, kcrash -, kdbusaddons -, kdelibs4support -, kguiaddons -, kiconthemes -, kinit -, khtml -, konsole -, kparts -, ktexteditor -, kwindowsystem -, poppler -}: - -let - unwrapped = - kdeDerivation rec { - name = "kile-${version}"; - version = "2017-02-09"; - - src = fetchgit { - url = git://anongit.kde.org/kile.git; - rev = "f77f6e627487c152f111e307ad6dc71699ade746"; - sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib"; - - }; - - nativeBuildInputs = [ ecm kdoctools ]; - - buildInputs = [ - kconfig - kcrash - kdbusaddons - kdelibs4support - kdoctools - kguiaddons - kiconthemes - kinit - khtml - kparts - ktexteditor - kwindowsystem - poppler - qtscript - ]; - - meta = { - description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment"; - homepage = https://www.kde.org/applications/office/kile/; - maintainers = with lib.maintainers; [ fridh ]; - license = lib.licenses.gpl2Plus; - }; - }; -in -kdeWrapper -{ - inherit unwrapped; - targets = [ "bin/kile" ]; - paths = [ konsole.unwrapped ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index ee7614bbcf10..ac6b319a0ddd 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -51,9 +51,7 @@ let }); - kdeFramework = let - broken = builtins.compareVersions self.qtbase.version "5.6.0" < 0; - in args: + kdeFramework = args: let inherit (args) name; inherit (srcs."${name}") src version; @@ -67,7 +65,6 @@ let ]; platforms = lib.platforms.linux; homepage = "http://www.kde.org"; - inherit broken; } // (args.meta or {}); }); diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 4bbe05fea6ee..31d8b7d7c8e0 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio -, qt4 ? null, extra-cmake-modules, qtbase ? null, qttools ? null +, qt4 ? null, ecm ? null, qtbase ? null, qttools ? null , withQt5 ? false , debug ? false }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { [ mesa libpulseaudio ] ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]); - nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 ecm; NIX_CFLAGS_COMPILE = "-fPIC"; diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 6d27ed5a0d32..607696dc562a 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -16,27 +16,30 @@ */ -{ pkgs +{ + newScope, + stdenv, fetchurl, makeSetupHook, makeWrapper, + bison, cups ? null, harfbuzz, mesa, perl, + libgnomeui, GConf, gnome_vfs, + gstreamer, gst-plugins-base, -# options -, developerBuild ? false -, decryptSslTraffic ? false + # options + developerBuild ? false, + decryptSslTraffic ? false, }: -let inherit (pkgs) makeSetupHook makeWrapper stdenv; in - with stdenv.lib; let mirror = "http://download.qt.io"; - srcs = import ./srcs.nix { inherit mirror; inherit (pkgs) fetchurl; }; + srcs = import ./srcs.nix { inherit mirror; inherit fetchurl; }; qtSubmodule = args: let inherit (args) name; inherit (srcs."${args.name}") version src; - inherit (pkgs.stdenv) mkDerivation; + inherit (stdenv) mkDerivation; in mkDerivation (args // { name = "${name}-${version}"; inherit src; @@ -62,12 +65,9 @@ let in { qtbase = callPackage ./qtbase { - mesa = pkgs.mesa_noglu; - harfbuzz = pkgs.harfbuzz-icu; - cups = if stdenv.isLinux then pkgs.cups else null; + inherit bison cups harfbuzz mesa; # GNOME dependencies are not used unless gtkStyle == true - inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs; - bison = pkgs.bison2; # error: too few arguments to function 'int yylex(... + inherit libgnomeui GConf gnome_vfs; inherit developerBuild decryptSslTraffic; }; @@ -84,7 +84,7 @@ let qtlocation = callPackage ./qtlocation.nix {}; /* qtmacextras = not packaged */ qtmultimedia = callPackage ./qtmultimedia.nix { - inherit (pkgs.gst_all_1) gstreamer gst-plugins-base; + inherit gstreamer gst-plugins-base; }; qtquick1 = callPackage ./qtquick1 {}; qtquickcontrols = callPackage ./qtquickcontrols.nix {}; @@ -124,6 +124,6 @@ let }; - self = makeScope pkgs.newScope addPackages; + self = makeScope newScope addPackages; in self diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 687708d98efa..542bf41d5874 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -14,28 +14,30 @@ top-level attribute to `top-level/all-packages.nix`. */ -{ pkgs +{ + newScope, + stdenv, fetchurl, makeSetupHook, makeWrapper, + bison, cups ? null, harfbuzz, mesa, perl, + gstreamer, gst-plugins-base, -# options -, developerBuild ? false -, decryptSslTraffic ? false + # options + developerBuild ? false, + decryptSslTraffic ? false, }: -let inherit (pkgs) makeSetupHook makeWrapper stdenv; in - with stdenv.lib; let mirror = "http://download.qt.io"; - srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; + srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; qtSubmodule = args: let inherit (args) name; version = args.version or srcs."${name}".version; src = args.src or srcs."${name}".src; - inherit (pkgs.stdenv) mkDerivation; + inherit (stdenv) mkDerivation; in mkDerivation (args // { name = "${name}-${version}"; inherit src; @@ -43,7 +45,7 @@ let propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); nativeBuildInputs = (args.nativeBuildInputs or []) - ++ [ pkgs.perl self.qmakeHook ]; + ++ [ perl self.qmakeHook ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; @@ -63,10 +65,7 @@ let in { qtbase = callPackage ./qtbase { - mesa = pkgs.mesa_noglu; - harfbuzz = pkgs.harfbuzz-icu; - cups = if stdenv.isLinux then pkgs.cups else null; - bison = pkgs.bison2; # error: too few arguments to function 'int yylex(... + inherit bison cups harfbuzz mesa; inherit developerBuild decryptSslTraffic; }; @@ -83,7 +82,7 @@ let qtlocation = callPackage ./qtlocation.nix {}; /* qtmacextras = not packaged */ qtmultimedia = callPackage ./qtmultimedia.nix { - inherit (pkgs.gst_all_1) gstreamer gst-plugins-base; + inherit gstreamer gst-plugins-base; }; qtquickcontrols = callPackage ./qtquickcontrols.nix {}; qtscript = callPackage ./qtscript {}; @@ -120,6 +119,6 @@ let (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh); }; - self = makeScope pkgs.newScope addPackages; + self = makeScope newScope addPackages; in self diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index d62bd3d1b51d..0fbcdfd9ebd8 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -14,28 +14,30 @@ top-level attribute to `top-level/all-packages.nix`. */ -{ pkgs +{ + newScope, + stdenv, fetchurl, makeSetupHook, makeWrapper, + bison, cups ? null, harfbuzz, mesa, perl, + gstreamer, gst-plugins-base, -# options -, developerBuild ? false -, decryptSslTraffic ? false + # options + developerBuild ? false, + decryptSslTraffic ? false, }: -let inherit (pkgs) makeSetupHook makeWrapper stdenv; in - with stdenv.lib; let mirror = "http://download.qt.io"; - srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; + srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; qtSubmodule = args: let inherit (args) name; version = args.version or srcs."${name}".version; src = args.src or srcs."${name}".src; - inherit (pkgs.stdenv) mkDerivation; + inherit (stdenv) mkDerivation; in mkDerivation (args // { name = "${name}-${version}"; inherit src; @@ -43,7 +45,7 @@ let propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); nativeBuildInputs = (args.nativeBuildInputs or []) - ++ [ pkgs.perl self.qmakeHook ]; + ++ [ perl self.qmakeHook ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; @@ -64,11 +66,7 @@ let qtbase = callPackage ./qtbase { inherit (srcs.qtbase) src version; - mesa = pkgs.mesa_noglu; - harfbuzz = pkgs.harfbuzz-icu; - cups = if stdenv.isLinux then pkgs.cups else null; - # GNOME dependencies are not used unless gtkStyle == true - bison = pkgs.bison2; # error: too few arguments to function 'int yylex(... + inherit bison cups harfbuzz mesa; inherit developerBuild decryptSslTraffic; }; @@ -79,7 +77,7 @@ let qtimageformats = callPackage ./qtimageformats.nix {}; qtlocation = callPackage ./qtlocation.nix {}; qtmultimedia = callPackage ./qtmultimedia.nix { - inherit (pkgs.gst_all_1) gstreamer gst-plugins-base; + inherit gstreamer gst-plugins-base; }; qtquickcontrols = callPackage ./qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {}; @@ -117,6 +115,6 @@ let }; - self = makeScope pkgs.newScope addPackages; + self = makeScope newScope addPackages; in self diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index a1eb2ad7084c..7fbbf27c8eba 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zip, zlib, qt, qmakeHook }: +{ fetchurl, stdenv, zip, zlib, qtbase, qmakeHook }: stdenv.mkDerivation rec { name = "quazip-0.7.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "cd quazip"; - buildInputs = [ zlib qt ]; + buildInputs = [ zlib qtbase ]; nativeBuildInputs = [ qmakeHook ]; meta = { diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 0c8e9d6bceef..7dc48db104c9 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl -, extra-cmake-modules, ki18n +, ecm, ki18n , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem , kitemviews, lcms2, libXrandr, qtx11extras @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; }; - nativeBuildInputs = [ extra-cmake-modules ki18n ]; + nativeBuildInputs = [ ecm ki18n ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eaf6813263af..318415b7512f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -17,7 +17,7 @@ in ### Deprecated aliases - for backward compatibility doNotDisplayTwice rec { - accounts-qt = qt5.accounts-qt; # added 2015-12-19 + accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 adobeReader = adobe-reader; aircrackng = aircrack-ng; # added 2016-01-14 arduino_core = arduino-core; # added 2015-02-04 @@ -51,7 +51,7 @@ doNotDisplayTwice rec { gettextWithExpat = gettext; # 2016-02-19 git-hub = gitAndTools.git-hub; # added 2016-04-29 googleAuthenticator = google-authenticator; # added 2016-10-16 - grantlee5 = qt5.grantlee; # added 2015-12-19 + grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gst_ffmpeg = gst-ffmpeg; # added 2017-02 gst_plugins_base = gst-plugins-base; # added 2017-02 gst_plugins_good = gst-plugins-good; # added 2017-02 @@ -71,7 +71,7 @@ doNotDisplayTwice rec { keybase-go = keybase; # added 2016-08-24 krename-qt5 = krename; # added 2017-02-18 letsencrypt = certbot; # added 2016-05-16 - libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 + libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 libcap_manpages = libcap.doc; # added 2016-04-29 libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 libcap_progs = libcap.out; # added 2016-04-29 @@ -83,7 +83,7 @@ doNotDisplayTwice rec { manpages = man-pages; # added 2015-12-06 man_db = man-db; # added 2016-05 midoriWrapper = midori; # added 2015-01 - mlt-qt5 = qt5.mlt; # added 2015-12-19 + mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 module_init_tools = kmod; # added 2016-04-22 mssys = ms-sys; # added 2015-12-13 multipath_tools = multipath-tools; # added 2016-01-21 @@ -96,13 +96,13 @@ doNotDisplayTwice rec { owncloudclient = owncloud-client; # added 2016-08 pidgin-with-plugins = pidgin; # added 2016-06 pidginlatexSF = pidginlatex; # added 2014-11-02 - poppler_qt5 = qt5.poppler; # added 2015-12-19 - qca-qt5 = qt5.qca-qt5; # added 2015-12-19 + poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 + qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 QmidiNet = qmidinet; # added 2016-05-22 qt_gstreamer = qt-gstreamer; # added 2017-02 qt_gstreamer1 = qt-gstreamer1; # added 2017-02 quake3game = ioquake3; # added 2016-01-14 - qwt6 = qt5.qwt; # added 2015-12-19 + qwt6 = libsForQt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rssglx = rss-glx; #added 2015-03-25 rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; @@ -119,7 +119,7 @@ doNotDisplayTwice rec { sqliteInteractive = sqlite-interactive; # added 2014-12-06 sshfsFuse = sshfs-fuse; # added 2016-09 system_config_printer = system-config-printer; # added 2016-01-03 - telepathy_qt5 = qt5.telepathy; # added 2015-12-19 + telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 ucsFonts = ucs-fonts; # added 2016-07-15 usb_modeswitch = usb-modeswitch; # added 2016-05-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73d418355ff4..7395a60bf8b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -381,7 +381,7 @@ with pkgs; aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; - albert = qt5.callPackage ../applications/misc/albert {}; + albert = libsForQt5.callPackage ../applications/misc/albert {}; amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { }; @@ -420,7 +420,7 @@ with pkgs; withGui = false; }; - apitrace = qt55.callPackage ../applications/graphics/apitrace {}; + apitrace = libsForQt55.callPackage ../applications/graphics/apitrace {}; argus = callPackage ../tools/networking/argus {}; @@ -746,7 +746,7 @@ with pkgs; clib = callPackage ../tools/package-management/clib { }; - colord-kde = qt5.callPackage ../tools/misc/colord-kde {}; + colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; consul = callPackage ../servers/consul { }; @@ -1094,7 +1094,7 @@ with pkgs; davix = callPackage ../tools/networking/davix { }; - cantata = qt5.callPackage ../applications/audio/cantata { + cantata = libsForQt5.callPackage ../applications/audio/cantata { ffmpeg = ffmpeg_2; }; @@ -1160,7 +1160,7 @@ with pkgs; citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; - cmst = qt5.callPackage ../tools/networking/cmst { }; + cmst = libsForQt5.callPackage ../tools/networking/cmst { }; colord = callPackage ../tools/misc/colord { }; @@ -1291,7 +1291,7 @@ with pkgs; cloud-utils = callPackage ../tools/misc/cloud-utils { }; - ckb = qt5.callPackage ../tools/misc/ckb { }; + ckb = libsForQt5.callPackage ../tools/misc/ckb { }; compass = callPackage ../development/tools/compass { }; @@ -1299,7 +1299,7 @@ with pkgs; convoy = callPackage ../tools/filesystems/convoy { }; - cool-retro-term = qt55.callPackage ../applications/misc/cool-retro-term { }; + cool-retro-term = libsForQt55.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { aclSupport = stdenv.isLinux; @@ -2202,7 +2202,7 @@ with pkgs; hecate = callPackage ../applications/editors/hecate { }; - heaptrack = callPackage ../development/tools/profiling/heaptrack {}; + heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; heimdall = callPackage ../tools/misc/heimdall { }; @@ -2252,11 +2252,11 @@ with pkgs; i2pd = callPackage ../tools/networking/i2pd {}; - i-score = qt5.callPackage ../applications/audio/i-score { }; + i-score = libsForQt5.callPackage ../applications/audio/i-score { }; iasl = callPackage ../development/compilers/iasl { }; - iannix = qt5.callPackage ../applications/audio/iannix { }; + iannix = libsForQt5.callPackage ../applications/audio/iannix { }; icecast = callPackage ../servers/icecast { }; @@ -2455,15 +2455,15 @@ with pkgs; kpcli = callPackage ../tools/security/kpcli { }; - krename = qt5.callPackage ../applications/misc/krename { }; + krename = libsForQt5.callPackage ../applications/misc/krename { }; - kronometer = qt5.callPackage ../tools/misc/kronometer { }; + kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; - kdiff3 = qt5.callPackage ../tools/text/kdiff3 { }; + kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; - peruse = qt5.callPackage ../tools/misc/peruse { }; + peruse = libsForQt5.callPackage ../tools/misc/peruse { }; - kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; + kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; kytea = callPackage ../tools/text/kytea { }; @@ -2862,7 +2862,7 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; - mgba = qt5.callPackage ../misc/emulators/mgba { }; + mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; mimeo = callPackage ../tools/misc/mimeo { }; @@ -3409,7 +3409,7 @@ with pkgs; inherit qt4; }; - pinentry_qt5 = qt5.callPackage ../tools/security/pinentry/qt5.nix { + pinentry_qt5 = libsForQt5.callPackage ../tools/security/pinentry/qt5.nix { libcap = if stdenv.isDarwin then null else libcap; }; @@ -3558,10 +3558,10 @@ with pkgs; qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; - qastools = qt5.callPackage ../tools/audio/qastools { }; + qastools = libsForQt5.callPackage ../tools/audio/qastools { }; - qesteidutil = qt5.callPackage ../tools/security/qesteidutil { } ; - qdigidoc = qt5.callPackage ../tools/security/qdigidoc { } ; + qesteidutil = libsForQt5.callPackage ../tools/security/qesteidutil { } ; + qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; esteidfirefoxplugin = callPackage ../applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin { }; @@ -3778,7 +3778,9 @@ with pkgs; quazip = quazip_qt4; }; - quazip_qt4 = self.qt5.quazip.override { qt = qt4; qmakeHook = qmake4Hook; }; + quazip_qt4 = libsForQt5.quazip.override { + qtbase = qt4; qmakeHook = qmake4Hook; + }; scrot = callPackage ../tools/graphics/scrot { }; @@ -3820,7 +3822,7 @@ with pkgs; siege = callPackage ../tools/networking/siege {}; - sigil = qt55.callPackage ../applications/editors/sigil { }; + sigil = libsForQt55.callPackage ../applications/editors/sigil { }; # aka., gpg-tools signing-party = callPackage ../tools/security/signing-party { }; @@ -3928,7 +3930,7 @@ with pkgs; su-exec = callPackage ../tools/security/su-exec {}; - subsurface = qt5.callPackage ../applications/misc/subsurface { }; + subsurface = libsForQt5.callPackage ../applications/misc/subsurface { }; sudo = callPackage ../tools/security/sudo { }; @@ -4060,7 +4062,7 @@ with pkgs; thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; - tiled = qt5.callPackage ../applications/editors/tiled { }; + tiled = libsForQt5.callPackage ../applications/editors/tiled { }; timemachine = callPackage ../applications/audio/timemachine { }; @@ -6284,7 +6286,7 @@ with pkgs; cmakeWithGui = cmakeCurses.override { useQt4 = true; }; # Does not actually depend on Qt 5 - extra-cmake-modules = qt5.ecmNoHooks; + extra-cmake-modules = libsForQt5.ecmNoHooks; coccinelle = callPackage ../development/tools/misc/coccinelle { ocamlPackages = ocamlPackages_4_01_0; @@ -6663,7 +6665,7 @@ with pkgs; premake = premake4; - qtcreator = qt5.callPackage ../development/qtcreator { }; + qtcreator = libsForQt5.callPackage ../development/qtcreator { }; r10k = callPackage ../tools/system/r10k { }; @@ -9288,28 +9290,52 @@ with pkgs; developerBuild = true; }); - qt55 = - let imported = import ../development/libraries/qt-5/5.5 { inherit pkgs; }; - # Libraries that cannot be built with newer versions of Qt 5 - qt55Only = self: with self; { - # Requires Qt Quick (deprecated in Qt 5.5, removed from Qt 5.6) - qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; - }; - in recurseIntoAttrs (imported.override (super: self: qt5LibsFun self // qt55Only self)); + qt55 = recurseIntoAttrs (import ../development/libraries/qt-5/5.5 { + inherit newScope; + inherit stdenv fetchurl makeSetupHook makeWrapper; + bison = bison2; # error: too few arguments to function 'int yylex(... + cups = if stdenv.isLinux then cups else null; + harfbuzz = harfbuzz-icu; + mesa = mesa_noglu; + inherit perl; + inherit (gnome2) libgnomeui GConf gnome_vfs; + inherit (gst_all_1) gstreamer gst-plugins-base; + }); - qt56 = - let imported = import ../development/libraries/qt-5/5.6 { inherit pkgs; }; - in recurseIntoAttrs (imported.override (super: qt5LibsFun)); + libsForQt55 = recurseIntoAttrs (lib.makeScope qt55.newScope mkLibsForQt5); - qt57 = - let imported = import ../development/libraries/qt-5/5.7 { inherit pkgs; }; - in recurseIntoAttrs (imported.override (super: qt5LibsFun)); + qt56 = recurseIntoAttrs (import ../development/libraries/qt-5/5.6 { + inherit newScope; + inherit stdenv fetchurl makeSetupHook makeWrapper; + bison = bison2; # error: too few arguments to function 'int yylex(... + cups = if stdenv.isLinux then cups else null; + harfbuzz = harfbuzz-icu; + mesa = mesa_noglu; + inherit perl; + inherit (gst_all_1) gstreamer gst-plugins-base; + }); + + libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5); + + qt57 = recurseIntoAttrs (import ../development/libraries/qt-5/5.7 { + inherit newScope; + inherit stdenv fetchurl makeSetupHook makeWrapper; + bison = bison2; # error: too few arguments to function 'int yylex(... + cups = if stdenv.isLinux then cups else null; + harfbuzz = harfbuzz-icu; + mesa = mesa_noglu; + inherit perl; + inherit (gst_all_1) gstreamer gst-plugins-base; + }); + + libsForQt57 = recurseIntoAttrs (lib.makeScope qt57.newScope mkLibsForQt5); qt5 = qt56; + libsForQt5 = libsForQt56; - qt5ct = qt5.callPackage ../tools/misc/qt5ct { }; + qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; - qt5LibsFun = self: with self; + mkLibsForQt5 = self: with self; let kdeFrameworks = import ../development/libraries/kde-frameworks { inherit pkgs; } self; in { @@ -9367,6 +9393,8 @@ with pkgs; qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; + qscintilla = callPackage ../development/libraries/qscintilla { withQt5 = true; }; @@ -9377,9 +9405,7 @@ with pkgs; qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; - quazip = callPackage ../development/libraries/quazip { - qt = qtbase; - }; + quazip = callPackage ../development/libraries/quazip { }; qwt = callPackage ../development/libraries/qwt/6.nix { }; @@ -12474,7 +12500,7 @@ with pkgs; xlsx2csv = pythonPackages.xlsx2csv; - zeal = qt5.callPackage ../data/documentation/zeal { }; + zeal = libsForQt5.callPackage ../data/documentation/zeal { }; ### APPLICATIONS @@ -12568,13 +12594,13 @@ with pkgs; antfs-cli = callPackage ../applications/misc/antfs-cli {}; - antimony = qt5.callPackage ../applications/graphics/antimony {}; + antimony = libsForQt5.callPackage ../applications/graphics/antimony {}; antiword = callPackage ../applications/office/antiword {}; ao = callPackage ../applications/graphics/ao {}; - aqemu = qt5.callPackage ../applications/virtualization/aqemu { }; + aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; ardour = callPackage ../applications/audio/ardour { inherit (gnome2) libgnomecanvas libgnomecanvasmm; @@ -12600,7 +12626,7 @@ with pkgs; astroid = callPackage ../applications/networking/mailreaders/astroid { }; audacious = callPackage ../applications/audio/audacious { }; - audaciousQt5 = qt5.callPackage ../applications/audio/audacious/qt-5.nix { }; + audaciousQt5 = libsForQt5.callPackage ../applications/audio/audacious/qt-5.nix { }; audacity = callPackage ../applications/audio/audacity { }; @@ -12662,7 +12688,7 @@ with pkgs; }; awesome = awesome-4-0; - awesomebump = qt5.callPackage ../applications/graphics/awesomebump { }; + awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { }; inherit (gnome3) baobab; @@ -12733,7 +12759,7 @@ with pkgs; bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; - bomi = qt5.callPackage ../applications/video/bomi { + bomi = libsForQt5.callPackage ../applications/video/bomi { youtube-dl = pythonPackages.youtube-dl; pulseSupport = config.pulseaudio or true; ffmpeg = ffmpeg_2; @@ -12761,7 +12787,7 @@ with pkgs; calcurse = callPackage ../applications/misc/calcurse { }; - calibre = qt5.callPackage ../applications/misc/calibre { }; + calibre = libsForQt5.callPackage ../applications/misc/calibre { }; calligra = kde4.callPackage ../applications/office/calligra { vc = vc_0_7; @@ -12782,7 +12808,7 @@ with pkgs; cava = callPackage ../applications/audio/cava { }; - cb2bib = qt5.callPackage ../applications/office/cb2bib { }; + cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -12857,7 +12883,7 @@ with pkgs; cni = callPackage ../applications/networking/cluster/cni {}; - communi = qt5.callPackage ../applications/networking/irc/communi { }; + communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; compiz = callPackage ../applications/window-managers/compiz { inherit (gnome2) GConf ORBit2 metacity; @@ -12904,7 +12930,7 @@ with pkgs; cutecom = callPackage ../tools/misc/cutecom { }; cutegram = - let callpkg = qt55.callPackage; + let callpkg = libsForQt55.callPackage; in callpkg ../applications/networking/instant-messengers/telegram/cutegram rec { libqtelegram-aseman-edition = callpkg ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { }; telegram-qml = callpkg ../applications/networking/instant-messengers/telegram/telegram-qml { @@ -12954,9 +12980,9 @@ with pkgs; plugins = []; }; - dfasma = qt5.callPackage ../applications/audio/dfasma { }; + dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dfilemanager = qt5.callPackage ../applications/misc/dfilemanager { }; + dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome2) libart_lgpl libgnomeui; @@ -13304,7 +13330,7 @@ with pkgs; keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; - keepassx-community = qt5.callPackage ../applications/misc/keepassx/community.nix { }; + keepassx-community = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; inherit (gnome3) evince; evolution_data_server = gnome3.evolution_data_server; @@ -13339,7 +13365,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices CoreAudio AudioUnit; }; - fmit = qt5.callPackage ../applications/audio/fmit { }; + fmit = libsForQt5.callPackage ../applications/audio/fmit { }; fmsynth = callPackage ../applications/audio/fmsynth { }; @@ -13357,7 +13383,7 @@ with pkgs; fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { }; - fritzing = qt5.callPackage ../applications/science/electronics/fritzing { }; + fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; fvwm = callPackage ../applications/window-managers/fvwm { }; @@ -13388,7 +13414,7 @@ with pkgs; gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; - goldendict = qt55.callPackage ../applications/misc/goldendict { }; + goldendict = libsForQt55.callPackage ../applications/misc/goldendict { }; inherit (ocamlPackages) google-drive-ocamlfuse; @@ -13496,7 +13522,7 @@ with pkgs; desktopName = "Firefox Beta"; }; - firestr = qt5.callPackage ../applications/networking/p2p/firestr + firestr = libsForQt5.callPackage ../applications/networking/p2p/firestr { boost = boost155; }; @@ -13647,7 +13673,7 @@ with pkgs; libquvi = callPackage ../applications/video/quvi/library.nix { }; - linssid = qt5.callPackage ../applications/networking/linssid { }; + linssid = libsForQt5.callPackage ../applications/networking/linssid { }; manuskript = callPackage ../applications/editors/manuskript { }; @@ -13734,7 +13760,7 @@ with pkgs; gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = qt5.callPackage ../applications/misc/gpsbabel { }; + gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; @@ -13742,7 +13768,7 @@ with pkgs; gpsprune = callPackage ../applications/misc/gpsprune { }; - gpxsee = qt5.callPackage ../applications/misc/gpxsee { }; + gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { }; gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { inherit (gnome2) gtk; @@ -13948,7 +13974,7 @@ with pkgs; lua = lua5_1; }; - ipe = qt5.callPackage ../applications/graphics/ipe { + ipe = libsForQt5.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; }; @@ -14016,13 +14042,13 @@ with pkgs; k3b = kde4.callPackage ../applications/misc/k3b/wrapper.nix { }; - k9copy = qt5.callPackage ../applications/video/k9copy {}; + k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; kadu = kde4.callPackage ../applications/networking/instant-messengers/kadu { }; kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {}; - kdeconnect = qt5.callPackage ../applications/misc/kdeconnect { }; + kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; kdecoration-viewer = kde5.callPackage ../tools/misc/kdecoration-viewer {}; @@ -14038,9 +14064,9 @@ with pkgs; kermit = callPackage ../tools/misc/kermit { }; - keyfinder = qt5.callPackage ../applications/audio/keyfinder { }; + keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; - keyfinder-cli = qt5.callPackage ../applications/audio/keyfinder-cli { }; + keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; keymon = callPackage ../applications/video/key-mon { }; @@ -14069,9 +14095,9 @@ with pkgs; kmplayer = kde4.callPackage ../applications/video/kmplayer { }; - konversation = qt5.callPackage ../applications/networking/irc/konversation { }; + konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; - krita = qt5.callPackage ../applications/graphics/krita { + krita = libsForQt5.callPackage ../applications/graphics/krita { vc = vc_0_7; openjpeg = openjpeg_1; }; @@ -14080,7 +14106,7 @@ with pkgs; ksuperkey = callPackage ../tools/X11/ksuperkey { }; - ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent { }; + ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; kubernetes = callPackage ../applications/networking/cluster/kubernetes { go = go_1_6; @@ -14204,7 +14230,7 @@ with pkgs; lrzsz = callPackage ../tools/misc/lrzsz { }; - luminanceHDR = qt55.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt55.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -14223,7 +14249,7 @@ with pkgs; lynx = callPackage ../applications/networking/browsers/lynx { }; - lyx = qt5.callPackage ../applications/misc/lyx { }; + lyx = libsForQt5.callPackage ../applications/misc/lyx { }; mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; @@ -14454,7 +14480,7 @@ with pkgs; else null; }; - musescore = qt55.callPackage ../applications/audio/musescore { }; + musescore = libsForQt55.callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { @@ -14502,11 +14528,11 @@ with pkgs; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; - shotcut = qt5.callPackage ../applications/video/shotcut { }; + shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; - smplayer = qt5.callPackage ../applications/video/smplayer { }; + smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = qt55.callPackage ../applications/video/smtube {}; + smtube = libsForQt55.callPackage ../applications/video/smtube {}; sudolikeaboss = callPackage ../tools/security/sudolikeaboss { }; @@ -14609,7 +14635,7 @@ with pkgs; oblogout = callPackage ../tools/X11/oblogout { }; - obs-studio = qt5.callPackage ../applications/video/obs-studio { + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { alsaSupport = stdenv.isLinux; pulseaudioSupport = config.pulseaudio or true; }; @@ -14709,9 +14735,9 @@ with pkgs; pflask = callPackage ../os-specific/linux/pflask {}; - photoqt = qt5.callPackage ../applications/graphics/photoqt { }; + photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { }; - phototonic = qt5.callPackage ../applications/graphics/phototonic { }; + phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { }; phrasendrescher = callPackage ../tools/security/phrasendrescher { }; @@ -14843,7 +14869,7 @@ with pkgs; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qbittorrent = qt5.callPackage ../applications/networking/p2p/qbittorrent { + qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { boost = boost; libtorrentRasterbar = libtorrentRasterbar_1_0; }; @@ -14857,15 +14883,15 @@ with pkgs; qgis = callPackage ../applications/gis/qgis {}; - qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { }; + qgroundcontrol = libsForQt55.callPackage ../applications/science/robotics/qgroundcontrol { }; - qjackctl = qt5.callPackage ../applications/audio/qjackctl { }; + qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; qmidinet = callPackage ../applications/audio/qmidinet { }; qmidiroute = callPackage ../applications/audio/qmidiroute { }; - qmmp = qt5.callPackage ../applications/audio/qmmp { }; + qmmp = libsForQt5.callPackage ../applications/audio/qmmp { }; qnotero = callPackage ../applications/office/qnotero { }; @@ -14877,15 +14903,15 @@ with pkgs; qt = qt4; }; - qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { }; + qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; qsynth = callPackage ../applications/audio/qsynth { }; qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; - qtox = qt5.callPackage ../applications/networking/instant-messengers/qtox { }; + qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; - qtpass = qt5.callPackage ../applications/misc/qtpass { }; + qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; @@ -14893,7 +14919,7 @@ with pkgs; qtscrobbler = callPackage ../applications/audio/qtscrobbler { }; - quassel = qt5.callPackage ../applications/networking/irc/quassel { + quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { monolithic = true; daemon = false; client = false; @@ -14919,7 +14945,7 @@ with pkgs; quirc = callPackage ../tools/graphics/quirc {}; - quiterss = qt5.callPackage ../applications/networking/newsreaders/quiterss {}; + quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; quodlibet-without-gst-plugins = callPackage ../applications/audio/quodlibet { }; @@ -14928,7 +14954,7 @@ with pkgs; gst-plugins-bad = null; }; - qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser { + qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; @@ -14947,7 +14973,7 @@ with pkgs; demo = false; }; - rapcad = qt55.callPackage ../applications/graphics/rapcad { boost = boost159; }; + rapcad = libsForQt55.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -14989,7 +15015,7 @@ with pkgs; retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); - ricochet = qt55.callPackage ../applications/networking/instant-messengers/ricochet { }; + ricochet = libsForQt55.callPackage ../applications/networking/instant-messengers/ricochet { }; ripser = callPackage ../applications/science/math/ripser { }; @@ -15169,13 +15195,13 @@ with pkgs; bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; - dropbox = qt5.callPackage ../applications/networking/dropbox { }; + dropbox = libsForQt5.callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; insync = callPackage ../applications/networking/insync { }; - lightdm = qt5.callPackage ../applications/display-managers/lightdm { + lightdm = libsForQt5.callPackage ../applications/display-managers/lightdm { qt4 = null; withQt5 = false; }; @@ -15196,11 +15222,11 @@ with pkgs; printrun = callPackage ../applications/misc/printrun { }; - sddm = qt5.callPackage ../applications/display-managers/sddm { + sddm = libsForQt5.callPackage ../applications/display-managers/sddm { themes = []; # extra themes, etc. }; - skrooge = qt5.callPackage ../applications/office/skrooge {}; + skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; slim = callPackage ../applications/display-managers/slim { libpng = libpng12; @@ -15222,7 +15248,7 @@ with pkgs; sipp = callPackage ../development/tools/misc/sipp { }; - sonic-visualiser = qt5.callPackage ../applications/audio/sonic-visualiser { + sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { inherit (pkgs.vamp) vampSDK; }; @@ -15337,7 +15363,7 @@ with pkgs; gconf = gnome2.GConf; }; - teamspeak_client = qt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_client = libsForQt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; taskjuggler-2 = callPackage ../applications/misc/taskjuggler/2.x { }; @@ -15482,7 +15508,7 @@ with pkgs; boost = boost160; }; - twmn = qt5.callPackage ../applications/misc/twmn { }; + twmn = libsForQt5.callPackage ../applications/misc/twmn { }; umurmur = callPackage ../applications/networking/umurmur { }; @@ -15560,7 +15586,7 @@ with pkgs; neovim = callPackage ../applications/editors/neovim { }; - neovim-qt = qt5.callPackage ../applications/editors/neovim/qt.nix { }; + neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; neovim-pygui = pythonPackages.neovim_gui; @@ -15648,7 +15674,7 @@ with pkgs; gtk = gtk2; }; - vlc_qt5 = qt5.vlc; + vlc_qt5 = libsForQt5.vlc; vmpk = callPackage ../applications/audio/vmpk { }; @@ -15861,7 +15887,7 @@ with pkgs; }; xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; - xca = qt5.callPackage ../applications/misc/xca { }; + xca = libsForQt5.callPackage ../applications/misc/xca { }; xcalib = callPackage ../tools/X11/xcalib { }; @@ -16147,13 +16173,13 @@ with pkgs; chessdb = callPackage ../games/chessdb { }; - chessx = qt5.callPackage ../games/chessx { }; + chessx = libsForQt5.callPackage ../games/chessx { }; chocolateDoom = callPackage ../games/chocolate-doom { }; ckan = callPackage ../games/ckan { }; - cockatrice = qt5.callPackage ../games/cockatrice { }; + cockatrice = libsForQt5.callPackage ../games/cockatrice { }; commandergenius = callPackage ../games/commandergenius { }; @@ -16232,7 +16258,7 @@ with pkgs; fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; - flightgear = qt5.callPackage ../games/flightgear { }; + flightgear = libsForQt5.callPackage ../games/flightgear { }; freecell-solver = callPackage ../games/freecell-solver { }; @@ -16347,7 +16373,7 @@ with pkgs; minecraft-server = callPackage ../games/minecraft-server { }; - multimc = qt5.callPackage ../games/multimc { }; + multimc = libsForQt5.callPackage ../games/multimc { }; minetest = callPackage ../games/minetest { libpng = libpng12; @@ -16357,7 +16383,7 @@ with pkgs; mrrescue = callPackage ../games/mrrescue { }; - mudlet = qt5.callPackage ../games/mudlet { + mudlet = libsForQt5.callPackage ../games/mudlet { inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3; }; @@ -16500,7 +16526,7 @@ with pkgs; solarus = callPackage ../games/solarus { }; - solarus-quest-editor = qt5.callPackage ../development/tools/solarus-quest-editor { }; + solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; @@ -16633,7 +16659,7 @@ with pkgs; warsow = callPackage ../games/warsow { }; - warzone2100 = qt5.callPackage ../games/warzone2100 { }; + warzone2100 = libsForQt5.callPackage ../games/warzone2100 { }; wesnoth = callPackage ../games/wesnoth { }; @@ -16755,7 +16781,10 @@ with pkgs; lumina = callPackage ../desktops/lumina { }; - lxqt = recurseIntoAttrs (callPackage ../desktops/lxqt { }); + lxqt = recurseIntoAttrs (import ../desktops/lxqt { + inherit pkgs libsForQt5 fetchFromGitHub; + inherit (lib) makeScope; + }); mate = recurseIntoAttrs (callPackage ../desktops/mate { callPackage = newScope pkgs.mate; @@ -16791,14 +16820,14 @@ with pkgs; merged = self: { plasma = plasma self; - frameworks = qt5.kdeFrameworks; + frameworks = libsForQt5.kdeFrameworks; applications = applications self; } - // qt5.kdeFrameworks + // libsForQt5.kdeFrameworks // plasma self // applications self; in - recurseIntoAttrs (lib.makeScope qt5.newScope merged); + recurseIntoAttrs (lib.makeScope libsForQt5.newScope merged); theme-vertex = callPackage ../misc/themes/vertex { }; @@ -17305,7 +17334,7 @@ with pkgs; yacas = callPackage ../applications/science/math/yacas { }; - speedcrunch = qt5.callPackage ../applications/science/math/speedcrunch { }; + speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { }; ### SCIENCE / MISC @@ -17336,7 +17365,7 @@ with pkgs; spyder = pythonPackages.spyder; - stellarium = qt5.callPackage ../applications/science/astronomy/stellarium { }; + stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; tulip = callPackage ../applications/science/misc/tulip { cmake = cmake_2_8; @@ -17398,7 +17427,7 @@ with pkgs; ### MISC - antimicro = qt5.callPackage ../tools/misc/antimicro { }; + antimicro = libsForQt5.callPackage ../tools/misc/antimicro { }; atari800 = callPackage ../misc/emulators/atari800 { }; @@ -17668,9 +17697,9 @@ with pkgs; pcre = pcre-cpp; }); - redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { }; + redis-desktop-manager = libsForQt55.callPackage ../applications/misc/redis-desktop-manager { }; - robomongo = qt5.callPackage ../applications/misc/robomongo { }; + robomongo = libsForQt5.callPackage ../applications/misc/robomongo { }; rucksack = callPackage ../development/tools/rucksack { }; @@ -17872,7 +17901,7 @@ with pkgs; vips = callPackage ../tools/graphics/vips { }; nip2 = callPackage ../tools/graphics/nip2 { }; - vokoscreen = qt5.callPackage ../applications/video/vokoscreen { }; + vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { }; wavegain = callPackage ../applications/audio/wavegain { }; @@ -18035,7 +18064,7 @@ with pkgs; discord = callPackage ../applications/networking/instant-messengers/discord { }; - golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {}; + golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {}; linkchecker = callPackage ../tools/networking/linkchecker { }; @@ -18057,9 +18086,9 @@ with pkgs; zuki-themes = callPackage ../misc/themes/zuki { }; - zoom-us = qt55.callPackage ../applications/networking/instant-messengers/zoom-us {}; + zoom-us = libsForQt55.callPackage ../applications/networking/instant-messengers/zoom-us {}; - tora = qt5.callPackage ../development/tools/tora {}; + tora = libsForQt5.callPackage ../development/tools/tora {}; xulrunner = firefox-unwrapped;