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

cool-retro-term: build with Qt 5.5

Browse Source
This commit is contained in:
Thomas Tuegel 2015-09-27 14:44:15 -05:00
parent 3ae6dabaed
commit c20b7ba4f3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchgit, makeWrapper, qt5, qmltermwidget }: { stdenv, fetchgit, makeWrapper, qtbase, qtquick1, qmltermwidget }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.0"; version = "1.0.0";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sed -i -e '/qmltermwidget/d' cool-retro-term.pro sed -i -e '/qmltermwidget/d' cool-retro-term.pro
''; '';
buildInputs = [ makeWrapper qt5.base qt5.quick1 qmltermwidget ]; buildInputs = [ makeWrapper qtbase qtquick1 qmltermwidget ];
configurePhase = "qmake PREFIX=$out"; configurePhase = "qmake PREFIX=$out";
@ -26,8 +26,7 @@ stdenv.mkDerivation rec {
mv $out/usr/bin $out/bin mv $out/usr/bin $out/bin
rmdir $out/usr rmdir $out/usr
wrapProgram $out/bin/cool-retro-term \ wrapQtProgram $out/bin/cool-retro-term
--prefix QML2_IMPORT_PATH : "${qmltermwidget}/lib/qml/"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/top-level/all-packages.nix
View File

@ -1136,7 +1136,7 @@ let
convmv = callPackage ../tools/misc/convmv { }; convmv = callPackage ../tools/misc/convmv { };
cool-retro-term = callPackage ../applications/misc/cool-retro-term { }; cool-retro-term = qt5Libs.callPackage ../applications/misc/cool-retro-term { };
coreutils = callPackage ../tools/misc/coreutils { coreutils = callPackage ../tools/misc/coreutils {
aclSupport = stdenv.isLinux; aclSupport = stdenv.isLinux;