From 121f944d0df29eebabd5fa91a5ecc69c0a549a0e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 20:38:09 -0600 Subject: [PATCH] qtpass: Qt 5 infrastructure update --- pkgs/applications/misc/qtpass/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 3c6d3ed36ce..3d45ef6884c 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, git, gnupg, makeWrapper, pass, qt5 }: +{ stdenv, fetchurl, git, gnupg, makeWrapper, pass, qtbase, qttools }: stdenv.mkDerivation rec { name = "qtpass-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0c07bd1eb9e5336c0225f891e5b9a9df103f218619cf7ec6311edf654e8db281"; }; - buildInputs = [ git gnupg makeWrapper pass qt5.base qt5.tools ]; + buildInputs = [ git gnupg makeWrapper pass qtbase qttools ]; configurePhase = "qmake CONFIG+=release PREFIX=$out DESTDIR=$out"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1c760a0a9..0763ef94dd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12881,7 +12881,7 @@ let qtox = callPackage ../applications/networking/instant-messengers/qtox { }; - qtpass = callPackage ../applications/misc/qtpass { }; + qtpass = qt5.callPackage ../applications/misc/qtpass { }; qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };