diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-09-08 13:29:54 -0400 |
---|---|---|
committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-09-08 14:20:23 -0400 |
commit | cb380983ed941e5e40fa7423c26f363636a42233 (patch) | |
tree | 5cc53f9d420a9bfcb4de966a8a41b651a0acc091 /pkgs | |
parent | ca2ba44cab47767c8127d1c8633e2b581644eb8f (diff) | |
download | nixlib-cb380983ed941e5e40fa7423c26f363636a42233.tar nixlib-cb380983ed941e5e40fa7423c26f363636a42233.tar.gz nixlib-cb380983ed941e5e40fa7423c26f363636a42233.tar.bz2 nixlib-cb380983ed941e5e40fa7423c26f363636a42233.tar.lz nixlib-cb380983ed941e5e40fa7423c26f363636a42233.tar.xz nixlib-cb380983ed941e5e40fa7423c26f363636a42233.tar.zst nixlib-cb380983ed941e5e40fa7423c26f363636a42233.zip |
qt5.qtwebkit: Fixes modules src being subtly broken.
b785d4813e5d0f428b9563b3cea7cc6953fc24db introduced breakage in Qt modules for 5.6 and 5.9, especially visible is Qt Webkit. This was manifested by having a non-sensical build log where it is using the top-level `src` attribute as source instead of Qt Webkit's own source. Were it not for the `src` top-level attribute (which is a legit package), the error would have been made obvious by passing `null` to `src`. This partily reverts newly introduced way `src` can be passed to a qtModule, instead relying on extending the `srcs` attrset. For ZHF #45960
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/qt-5/5.11/default.nix | 23 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/qtModule.nix | 2 |
3 files changed, 14 insertions, 16 deletions
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 2a706fc7b6e8..d65fe9d219c0 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -34,7 +34,18 @@ let qtCompatVersion = "5.11"; mirror = "http://download.qt.io"; - srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; + srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { + # Community port of the now unmaintained upstream qtwebkit. + qtwebkit = { + src = fetchFromGitHub { + owner = "annulen"; + repo = "webkit"; + rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8"; + sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf"; + }; + version = "5.212-alpha-01-26-2018"; + }; + }; patches = { qtbase = [ @@ -102,15 +113,7 @@ let qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; qtwebengine = callPackage ../modules/qtwebengine.nix {}; - qtwebkit = callPackage ../modules/qtwebkit.nix { - src = fetchFromGitHub { - owner = "annulen"; - repo = "webkit"; - rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8"; - sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf"; - }; - version = "5.212-alpha-01-26-2018"; - }; + qtwebkit = callPackage ../modules/qtwebkit.nix {}; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 833433fabeca..970ee2e5c807 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -5,8 +5,6 @@ , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby , darwin , flashplayerFix ? false -, src ? null -, version ? null }: let @@ -35,9 +33,6 @@ qtModule { cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ]; - inherit src; - inherit version; - __impureHostDeps = optionals (stdenv.isDarwin) [ "/usr/lib/libicucore.dylib" ]; diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index e18564aaabe2..84a9d30918b1 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -8,7 +8,7 @@ args: let inherit (args) name; - version = if (args.version or null) == null then srcs."${name}".version else args.version; + version = args.version or srcs."${name}".version; src = args.src or srcs."${name}".src; in |