diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:21:30 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:08:49 -0500 |
| commit | 4a3d7eae7ee878db12b982b9aa7ac2e1f3dcf72d (patch) | |
| tree | d5d5a9c2f6073d01f4ffecb29a7a29e3f9803521 | |
| parent | 3d6110d2217f40225debc2f1902b0f22142e6f66 (diff) | |
qmltermwidget: build with Qt 5.5
| -rw-r--r-- | pkgs/development/libraries/qmltermwidget/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 9c657ec52d7f4..4d12f020d1e8d 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt5 }: +{ stdenv, fetchgit, qtbase, qtquick1 }: stdenv.mkDerivation rec { version = "0.1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "19pz27jsdpa3pybj8sghmmd1zqgr73js1mp3875rhx158dav37nz"; }; - buildInputs = [ qt5.base qt5.quick1 ]; + buildInputs = [ qtbase qtquick1 ]; patchPhase = '' substituteInPlace qmltermwidget.pro \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 600184c77bac7..79878289088d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7900,8 +7900,6 @@ let qjson = callPackage ../development/libraries/qjson { }; - qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; - qoauth = callPackage ../development/libraries/qoauth { }; quazip = callPackage ../development/libraries/quazip { @@ -7956,6 +7954,8 @@ let qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; + signon = callPackage ../development/libraries/signon { }; vlc = callPackage ../applications/video/vlc { |