public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtxmlpatterns: fix dependency with qtdeclarative

Browse Source 
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
<8c6e24329e>
and qtdeclarative <0477a057fd>
This commit is contained in:
Anthony Cowley 2019-01-16 20:57:29 -05:00
parent be445a9074
commit 5fc5f15206
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
View File

@ -1,10 +1,10 @@
{ qtModule, lib, python2, qtbase, qtsvg, qtxmlpatterns }: { qtModule, lib, python2, qtbase, qtsvg }:
with lib; with lib;
qtModule { qtModule {
name = "qtdeclarative"; name = "qtdeclarative";
qtInputs = [ qtbase qtsvg qtxmlpatterns ]; qtInputs = [ qtbase qtsvg ];
nativeBuildInputs = [ python2 ]; nativeBuildInputs = [ python2 ];
outputs = [ "out" "dev" "bin" ]; outputs = [ "out" "dev" "bin" ];
preConfigure = '' preConfigure = ''

4
pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix
View File

@ -1,7 +1,7 @@
{ qtModule, qtbase }: { qtModule, qtbase, qtdeclarative }:
qtModule { qtModule {
name = "qtxmlpatterns"; name = "qtxmlpatterns";
qtInputs = [ qtbase ]; qtInputs = [ qtbase qtdeclarative ];
devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ]; devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ];
} }