about summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorAnthony Cowley <acowley@gmail.com>2019-01-16 20:57:29 -0500
committerAnthony Cowley <acowley@gmail.com>2019-01-16 20:57:29 -0500
commit5fc5f152064297a214dc2d1276002ec21aa3855c (patch)
tree187597576e9e54ae680ce01e1a793d3ef7ac5833 /pkgs/development/libraries
parentbe445a9074f139d63e704fa82610d25456562c3d (diff)
downloadnixlib-5fc5f152064297a214dc2d1276002ec21aa3855c.tar
nixlib-5fc5f152064297a214dc2d1276002ec21aa3855c.tar.gz
nixlib-5fc5f152064297a214dc2d1276002ec21aa3855c.tar.bz2
nixlib-5fc5f152064297a214dc2d1276002ec21aa3855c.tar.lz
nixlib-5fc5f152064297a214dc2d1276002ec21aa3855c.tar.xz
nixlib-5fc5f152064297a214dc2d1276002ec21aa3855c.tar.zst
nixlib-5fc5f152064297a214dc2d1276002ec21aa3855c.zip
qtxmlpatterns: fix dependency with qtdeclarative
In Qt-5.12, the order of the dependency between these two packages
flipped.

A symptom of the problem is an error like, `module
"QtQuick.XmlListModel" is not installed`.

The upstream changes that this reflects are in qtxmlpatterns
<https://github.com/qt/qtxmlpatterns/commit/8c6e24329ecd65f364654b1ca2b6a273f0826a8b>
and qtdeclarative <https://github.com/qt/qtdeclarative/commit/0477a057fd02050fd330760bf046f5e0e91a9331>
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/qt-5/modules/qtdeclarative.nix4
-rw-r--r--pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
index f9b8cdc8cf02..7c1fa449ebba 100644
--- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
@@ -1,10 +1,10 @@
-{ qtModule, lib, python2, qtbase, qtsvg, qtxmlpatterns }:
+{ qtModule, lib, python2, qtbase, qtsvg }:
 
 with lib;
 
 qtModule {
   name = "qtdeclarative";
-  qtInputs = [ qtbase qtsvg qtxmlpatterns ];
+  qtInputs = [ qtbase qtsvg ];
   nativeBuildInputs = [ python2 ];
   outputs = [ "out" "dev" "bin" ];
   preConfigure = ''
diff --git a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix
index ee8ef617fc8d..7ac922421f08 100644
--- a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix
@@ -1,7 +1,7 @@
-{ qtModule, qtbase }:
+{ qtModule, qtbase, qtdeclarative }:
 
 qtModule {
   name = "qtxmlpatterns";
-  qtInputs = [ qtbase ];
+  qtInputs = [ qtbase qtdeclarative ];
   devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ];
 }