2017-02-28 15:37:57 +00:00
|
|
|
/*
|
|
|
|
|
|
|
|
# Updates
|
|
|
|
|
|
|
|
Before a major version update, make a copy of this directory. (We like to
|
|
|
|
keep the old version around for a short time after major updates.) Add a
|
|
|
|
top-level attribute to `top-level/all-packages.nix`.
|
|
|
|
|
2017-12-11 17:32:16 +00:00
|
|
|
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
|
2017-02-28 15:37:57 +00:00
|
|
|
2. From the top of the Nixpkgs tree, run
|
2017-12-11 17:32:16 +00:00
|
|
|
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
|
2017-05-15 12:44:33 +01:00
|
|
|
3. Update `qtCompatVersion` below if the minor version number changes.
|
|
|
|
4. Check that the new packages build correctly.
|
|
|
|
5. Commit the changes and open a pull request.
|
2017-02-28 15:37:57 +00:00
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
{
|
|
|
|
newScope,
|
2019-01-30 22:50:48 +00:00
|
|
|
stdenv, fetchurl, fetchpatch, makeSetupHook,
|
2018-02-24 13:38:25 +00:00
|
|
|
bison, cups ? null, harfbuzz, libGL, perl,
|
2017-03-20 17:18:47 +00:00
|
|
|
gstreamer, gst-plugins-base, gtk3, dconf,
|
2018-11-17 19:59:38 +00:00
|
|
|
cf-private,
|
2017-02-28 15:37:57 +00:00
|
|
|
|
|
|
|
# options
|
|
|
|
developerBuild ? false,
|
|
|
|
decryptSslTraffic ? false,
|
2018-01-19 13:59:17 +00:00
|
|
|
debug ? false,
|
2017-02-28 15:37:57 +00:00
|
|
|
}:
|
|
|
|
|
|
|
|
with stdenv.lib;
|
|
|
|
|
|
|
|
let
|
|
|
|
|
2017-06-28 03:15:44 +01:00
|
|
|
qtCompatVersion = "5.9";
|
2017-05-15 12:44:33 +01:00
|
|
|
|
2017-02-28 15:37:57 +00:00
|
|
|
mirror = "http://download.qt.io";
|
|
|
|
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
|
|
|
|
|
2017-10-24 12:39:54 +01:00
|
|
|
patches = {
|
2018-12-01 20:09:33 +00:00
|
|
|
qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
|
2017-10-24 12:39:54 +01:00
|
|
|
qtdeclarative = [ ./qtdeclarative.patch ];
|
|
|
|
qtscript = [ ./qtscript.patch ];
|
|
|
|
qtserialport = [ ./qtserialport.patch ];
|
|
|
|
qttools = [ ./qttools.patch ];
|
|
|
|
qtwebkit = [ ./qtwebkit.patch ];
|
2019-01-30 22:50:48 +00:00
|
|
|
qtvirtualkeyboard = [
|
|
|
|
(fetchpatch {
|
|
|
|
name = "CVE-2018-19865-A.patch";
|
|
|
|
url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=61780a113f02b3c62fb14516fe8ea47d91f9ed9a";
|
|
|
|
sha256 = "0jd4nzaz9ndm9ryvrkav7kjs437l661288diklhbmgh249f8gki0";
|
|
|
|
})
|
|
|
|
(fetchpatch {
|
|
|
|
name = "CVE-2018-19865-B.patch";
|
|
|
|
url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=c0ac7a4c684e2fed60a72ceee53da89eea3f95a7";
|
|
|
|
sha256 = "0yvxrx5vx6845vgnq8ml3q93y61py5j0bvhqj7nqvpbmyj1wy1p3";
|
|
|
|
|
|
|
|
})
|
|
|
|
(fetchpatch {
|
|
|
|
name = "CVE-2018-19865-C.patch";
|
|
|
|
url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=a2e7b8412f56841e12ed20a39f4a38e32d3c1e30";
|
|
|
|
sha256 = "1yijysa9gy5xbxndx5ri0dkfrjqja0d1bsx52qz4mhzi4pkbib02";
|
|
|
|
})
|
|
|
|
];
|
|
|
|
|
2017-10-24 12:39:54 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
mkDerivation =
|
|
|
|
import ../mkDerivation.nix
|
|
|
|
{ inherit stdenv; inherit (stdenv) lib; }
|
|
|
|
{ inherit debug; };
|
|
|
|
|
|
|
|
qtModule =
|
|
|
|
import ../qtModule.nix
|
|
|
|
{ inherit mkDerivation perl; inherit (stdenv) lib; }
|
|
|
|
{ inherit self srcs patches; };
|
2017-02-28 15:37:57 +00:00
|
|
|
|
|
|
|
addPackages = self: with self;
|
|
|
|
let
|
2017-10-24 12:39:54 +01:00
|
|
|
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
|
2017-02-28 15:37:57 +00:00
|
|
|
in {
|
|
|
|
|
2017-06-02 16:49:32 +01:00
|
|
|
inherit mkDerivation;
|
|
|
|
|
2017-10-24 12:39:54 +01:00
|
|
|
qtbase = callPackage ../modules/qtbase.nix {
|
2017-02-28 15:37:57 +00:00
|
|
|
inherit (srcs.qtbase) src version;
|
2017-10-24 12:39:54 +01:00
|
|
|
patches = patches.qtbase;
|
2018-02-24 13:38:25 +00:00
|
|
|
inherit bison cups harfbuzz libGL;
|
2017-10-24 12:39:54 +01:00
|
|
|
withGtk3 = true; inherit dconf gtk3;
|
2017-02-28 15:37:57 +00:00
|
|
|
inherit developerBuild decryptSslTraffic;
|
|
|
|
};
|
|
|
|
|
2017-10-24 12:39:54 +01:00
|
|
|
qtcharts = callPackage ../modules/qtcharts.nix {};
|
|
|
|
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
|
|
|
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
|
|
|
qtdoc = callPackage ../modules/qtdoc.nix {};
|
|
|
|
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
|
|
|
|
qtimageformats = callPackage ../modules/qtimageformats.nix {};
|
|
|
|
qtlocation = callPackage ../modules/qtlocation.nix {};
|
2018-11-17 19:59:38 +00:00
|
|
|
qtmacextras = callPackage ../modules/qtmacextras.nix {
|
|
|
|
inherit cf-private;
|
|
|
|
};
|
2017-10-24 12:39:54 +01:00
|
|
|
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
|
2017-02-28 15:37:57 +00:00
|
|
|
inherit gstreamer gst-plugins-base;
|
|
|
|
};
|
|
|
|
qtquick1 = null;
|
2017-10-24 12:39:54 +01:00
|
|
|
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
|
|
|
|
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
|
|
|
|
qtscript = callPackage ../modules/qtscript.nix {};
|
|
|
|
qtsensors = callPackage ../modules/qtsensors.nix {};
|
|
|
|
qtserialport = callPackage ../modules/qtserialport.nix {};
|
|
|
|
qtsvg = callPackage ../modules/qtsvg.nix {};
|
|
|
|
qttools = callPackage ../modules/qttools.nix {};
|
|
|
|
qttranslations = callPackage ../modules/qttranslations.nix {};
|
2017-12-27 21:38:09 +00:00
|
|
|
qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {};
|
2017-10-24 12:39:54 +01:00
|
|
|
qtwayland = callPackage ../modules/qtwayland.nix {};
|
|
|
|
qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
|
|
|
|
qtwebengine = callPackage ../modules/qtwebengine.nix {};
|
|
|
|
qtwebkit = callPackage ../modules/qtwebkit.nix {};
|
|
|
|
qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
|
|
|
|
qtx11extras = callPackage ../modules/qtx11extras.nix {};
|
|
|
|
qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
|
2017-02-28 15:37:57 +00:00
|
|
|
|
|
|
|
env = callPackage ../qt-env.nix {};
|
2018-02-18 12:28:26 +00:00
|
|
|
full = env "qt-full-${qtbase.version}" ([
|
2017-07-01 14:48:18 +01:00
|
|
|
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
|
2018-02-17 12:20:12 +00:00
|
|
|
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
|
|
|
|
qtscript qtsensors qtserialport qtsvg qttools qttranslations
|
|
|
|
qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
|
|
|
|
qtx11extras qtxmlpatterns
|
2017-03-25 23:16:51 +00:00
|
|
|
] ++ optional (!stdenv.isDarwin) qtwayland
|
|
|
|
++ optional (stdenv.isDarwin) qtmacextras);
|
2017-02-28 15:37:57 +00:00
|
|
|
|
2017-05-17 20:25:42 +01:00
|
|
|
qmake = makeSetupHook {
|
|
|
|
deps = [ self.qtbase.dev ];
|
2017-10-24 12:39:54 +01:00
|
|
|
substitutions = {
|
|
|
|
inherit (stdenv) isDarwin;
|
|
|
|
qtbase_dev = self.qtbase.dev;
|
|
|
|
fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh;
|
|
|
|
};
|
|
|
|
} ../hooks/qmake-hook.sh;
|
2017-02-28 15:37:57 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
self = makeScope newScope addPackages;
|
|
|
|
|
|
|
|
in self
|