cool-retro-term: build with Qt 5.5

+4 -5
+3 -4
pkgs/applications/misc/cool-retro-term/default.nix
··· 1 - { stdenv, fetchgit, makeWrapper, qt5, qmltermwidget }: 1 + { stdenv, fetchgit, makeWrapper, qtbase, qtquick1, qmltermwidget }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 version = "1.0.0"; ··· 15 15 sed -i -e '/qmltermwidget/d' cool-retro-term.pro 16 16 ''; 17 17 18 - buildInputs = [ makeWrapper qt5.base qt5.quick1 qmltermwidget ]; 18 + buildInputs = [ makeWrapper qtbase qtquick1 qmltermwidget ]; 19 19 20 20 configurePhase = "qmake PREFIX=$out"; 21 21 ··· 26 26 mv $out/usr/bin $out/bin 27 27 rmdir $out/usr 28 28 29 - wrapProgram $out/bin/cool-retro-term \ 30 - --prefix QML2_IMPORT_PATH : "${qmltermwidget}/lib/qml/" 29 + wrapQtProgram $out/bin/cool-retro-term 31 30 ''; 32 31 33 32 enableParallelBuilding = true;
+1 -1
pkgs/top-level/all-packages.nix
··· 1136 1136 1137 1137 convmv = callPackage ../tools/misc/convmv { }; 1138 1138 1139 - cool-retro-term = callPackage ../applications/misc/cool-retro-term { }; 1139 + cool-retro-term = qt5Libs.callPackage ../applications/misc/cool-retro-term { }; 1140 1140 1141 1141 coreutils = callPackage ../tools/misc/coreutils { 1142 1142 aclSupport = stdenv.isLinux;