yubikey-personalization-gui: move to qmake4Hook

This commit is contained in:
Nikolay Amiantov 2016-04-17 02:53:07 +03:00
parent ea56bb7331
commit 8ab48c32e7
2 changed files with 4 additions and 10 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt, libyubikey }:
{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt4, qmake4Hook, libyubikey }:
stdenv.mkDerivation rec {
name = "yubikey-personalization-gui-3.1.24";
@ -8,13 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0aj8cvajswkwzig0py0mjnfw0m8xsilisdcnixpjx9xxsxz5yacq";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ yubikey-personalization qt libyubikey ];
nativeBuildInputs = [ pkgconfig qmake4Hook ];
buildInputs = [ yubikey-personalization qt4 libyubikey ];
configurePhase = ''
qmake
'';
installPhase = ''
mkdir -p $out/bin
cp build/release/yubikey-personalization-gui $out/bin

View File

@ -9162,9 +9162,7 @@ in
libusb = libusb1;
};
yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui {
qt = qt4;
};
yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { };
zeitgeist = callPackage ../development/libraries/zeitgeist { };