mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 18:42:15 +00:00
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 <8c6e24329e
> and qtdeclarative <0477a057fd
>
This commit is contained in:
parent
be445a9074
commit
5fc5f15206
|
@ -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 = ''
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ qtModule, qtbase }:
|
||||
{ qtModule, qtbase, qtdeclarative }:
|
||||
|
||||
qtModule {
|
||||
name = "qtxmlpatterns";
|
||||
qtInputs = [ qtbase ];
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue