From 17e17ea64965b96f76f09b564c546eff8c66c8d0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 20:49:14 -0600 Subject: [PATCH] cmst: Qt 5 infrastructure update --- pkgs/tools/networking/cmst/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 3bfa65cb4724..1b5767653fe2 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt5, makeWrapper, libX11 }: +{ stdenv, fetchgit, qtbase, makeWrapper, libX11 }: stdenv.mkDerivation rec { name = "cmst-2014.12.05"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "070rxv3kyn41ra7nnk1wbqvy6fjg38h7hrdv4dn71b201kmzd194"; }; - buildInputs = [ qt5.base makeWrapper ]; + buildInputs = [ qtbase makeWrapper ]; configurePhase = '' substituteInPlace ./cmst.pro \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3130e821bf36..39c110d1e4bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1072,7 +1072,7 @@ let citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; - cmst = callPackage ../tools/networking/cmst { }; + cmst = qt5.callPackage ../tools/networking/cmst { }; colord = callPackage ../tools/misc/colord { };