From c20b7ba4f35bdce4ef8c7566defeb6dbe272dde1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 14:44:15 -0500 Subject: [PATCH] cool-retro-term: build with Qt 5.5 --- pkgs/applications/misc/cool-retro-term/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 455d33860fb6..9f97e1eccee6 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, qt5, qmltermwidget }: +{ stdenv, fetchgit, makeWrapper, qtbase, qtquick1, qmltermwidget }: stdenv.mkDerivation rec { version = "1.0.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 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"; @@ -26,8 +26,7 @@ stdenv.mkDerivation rec { mv $out/usr/bin $out/bin rmdir $out/usr - wrapProgram $out/bin/cool-retro-term \ - --prefix QML2_IMPORT_PATH : "${qmltermwidget}/lib/qml/" + wrapQtProgram $out/bin/cool-retro-term ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 491e2c469a1f..984b49adfd0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1136,7 +1136,7 @@ let 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 { aclSupport = stdenv.isLinux;