jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12059 from svenkeidel/cool-retro-term-fix

Browse Source 
cool-retro-term: add missing dependencies and fix qmltermwidget, fixes #12027
This commit is contained in:
Tobias Geerinckx-Rice 2016-01-01 22:53:37 +01:00
commit 7dc9ecd803
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/misc/cool-retro-term/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget }: { stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget,
qtquickcontrols, qtgraphicaleffects }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.0"; version = "1.0.0";
@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
sed -i -e '/qmltermwidget/d' cool-retro-term.pro sed -i -e '/qmltermwidget/d' cool-retro-term.pro
''; '';
buildInputs = [ qtbase qtquick1 qmltermwidget ]; buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
nativeBuildInputs = [ makeQtWrapper ]; nativeBuildInputs = [ makeQtWrapper ];
configurePhase = "qmake PREFIX=$out"; configurePhase = "qmake PREFIX=$out";

2
pkgs/development/libraries/qmltermwidget/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
substituteInPlace qmltermwidget.pro \ substituteInPlace qmltermwidget.pro \
--replace '$$[QT_INSTALL_QML]' "/lib/qml/" --replace '$$[QT_INSTALL_QML]' "/lib/qt5/qml/"
''; '';
configurePhase = "qmake PREFIX=$out"; configurePhase = "qmake PREFIX=$out";