summary refs log tree commit diff
path: root/pkgs/development/libraries/qt-5/qtModule.nix
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2018-09-08 13:29:54 -0400
committerSamuel Dionne-Riel <samuel@dionne-riel.com>2018-09-08 14:20:23 -0400
commitcb380983ed941e5e40fa7423c26f363636a42233 (patch)
tree5cc53f9d420a9bfcb4de966a8a41b651a0acc091 /pkgs/development/libraries/qt-5/qtModule.nix
parentca2ba44cab47767c8127d1c8633e2b581644eb8f (diff)
downloadnixpkgs-cb380983ed941e5e40fa7423c26f363636a42233.tar
nixpkgs-cb380983ed941e5e40fa7423c26f363636a42233.tar.gz
nixpkgs-cb380983ed941e5e40fa7423c26f363636a42233.tar.bz2
nixpkgs-cb380983ed941e5e40fa7423c26f363636a42233.tar.lz
nixpkgs-cb380983ed941e5e40fa7423c26f363636a42233.tar.xz
nixpkgs-cb380983ed941e5e40fa7423c26f363636a42233.tar.zst
nixpkgs-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/development/libraries/qt-5/qtModule.nix')
-rw-r--r--pkgs/development/libraries/qt-5/qtModule.nix2
1 files changed, 1 insertions, 1 deletions
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