From cb380983ed941e5e40fa7423c26f363636a42233 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 8 Sep 2018 13:29:54 -0400 Subject: 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 --- pkgs/development/libraries/qt-5/qtModule.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/qt-5/qtModule.nix') diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index e18564aaabe..84a9d30918b 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 -- cgit 1.4.1