diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 20:24:29 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-20 07:56:46 -0600 |
| commit | 07a79f2a9b3fa565d8fd58f71213da620352e0cf (patch) | |
| tree | 347ac93ae477c3643505a03c64a24e6fca98f5be | |
| parent | 5af2e7b76e45cd924743e73012f14d7a703d0984 (diff) | |
sigil: Qt 5 infrastructure update
| -rw-r--r-- | pkgs/applications/editors/sigil/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 2af662ded7f2..ad6f599a3617 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, unzip, cmake, pkgconfig, makeWrapper -, hunspell, minizip, boost, xercesc, qt5 +, hunspell, minizip, boost, xercesc +, qtbase, qttools, qtwebkit, qtxmlpatterns }: let @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip cmake pkgconfig - hunspell minizip boost xercesc qt5.base qt5.tools qt5.webkit qt5.xmlpatterns + hunspell minizip boost xercesc qtbase qttools qtwebkit qtxmlpatterns ]; # XXX: the compiler seems to treat the .h file inappropriately: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 948b5b896adb..64e1dbdac97a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3027,7 +3027,7 @@ let siege = callPackage ../tools/networking/siege {}; - sigil = callPackage ../applications/editors/sigil { }; + sigil = qt5.callPackage ../applications/editors/sigil { }; # aka., gpg-tools signing-party = callPackage ../tools/security/signing-party { }; |