From 30ff95ea594795f13411d2c0e2ed623c13102903 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Fri, 1 Jan 2016 12:00:11 +0100 Subject: [PATCH] cool-retro-term: add missing dependencies and fix qmltermwidget --- pkgs/applications/misc/cool-retro-term/default.nix | 5 +++-- pkgs/development/libraries/qmltermwidget/default.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 890bc2c016b0..92328ab9846c 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget }: +{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget, +qtquickcontrols, qtgraphicaleffects }: stdenv.mkDerivation rec { version = "1.0.0"; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { sed -i -e '/qmltermwidget/d' cool-retro-term.pro ''; - buildInputs = [ qtbase qtquick1 qmltermwidget ]; + buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ]; nativeBuildInputs = [ makeQtWrapper ]; configurePhase = "qmake PREFIX=$out"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 24e1d2c9b9c1..64d8570460cb 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace qmltermwidget.pro \ - --replace '$$[QT_INSTALL_QML]' "/lib/qml/" + --replace '$$[QT_INSTALL_QML]' "/lib/qt5/qml/" ''; configurePhase = "qmake PREFIX=$out";