From 5fc5f152064297a214dc2d1276002ec21aa3855c Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 16 Jan 2019 20:57:29 -0500 Subject: 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 and qtdeclarative --- pkgs/development/libraries/qt-5/modules/qtdeclarative.nix | 4 ++-- pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries') 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" ]; } -- cgit 1.4.1