From a0502800cf4927d16285eb1a731f82b859d340e9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 May 2018 23:07:40 +0200 Subject: [PATCH] yubikey-personalization-gui: port to qt5 Uses QT5's `qmake` hook (http://doc.qt.io/qt-5/qmake-manual.html) to build `yubikey-personalization-gui` with a non-90s interface. See #33248 --- pkgs/tools/misc/yubikey-personalization-gui/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index e6a1c93d2bb..d507816dbd3 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt4, qmake4Hook, libyubikey }: +{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }: stdenv.mkDerivation rec { name = "yubikey-personalization-gui-3.1.25"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; - nativeBuildInputs = [ pkgconfig qmake4Hook ]; - buildInputs = [ yubikey-personalization qt4 libyubikey ]; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ yubikey-personalization qtbase libyubikey ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52a3c0619fe..3dc6294d3e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11994,7 +11994,7 @@ with pkgs; libusb = libusb1; }; - yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { }; + yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; zeitgeist = callPackage ../development/libraries/zeitgeist { };