From 732de877869a1f59d4226452e379eaa1cc998561 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 20:37:14 -0600 Subject: [PATCH] twmn: Qt 5 infrastructure update --- pkgs/applications/misc/twmn/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index e2a21822acd7..bb3f359ab8ff 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchgit, qt5, pkgconfig, boost }: +{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, pkgconfig, boost }: stdenv.mkDerivation rec { name = "twmn-git-2014-09-23"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9c91e9d3d6d7f9d90d34da6f1a4b9f3dee65605c1e43729417d6921c54dded6b"; }; - buildInputs = [ qt5.base qt5.x11extras pkgconfig boost ]; + buildInputs = [ qtbase qtx11extras pkgconfig boost ]; configurePhase = '' sed -i s/-Werror// twmnd/twmnd.pro diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac7f0009228c..ed1c760a0a9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13349,7 +13349,7 @@ let twister = callPackage ../applications/networking/p2p/twister { }; - twmn = callPackage ../applications/misc/twmn { }; + twmn = qt5.callPackage ../applications/misc/twmn { }; twinkle = callPackage ../applications/networking/instant-messengers/twinkle { };