diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-05 11:40:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-05 11:40:13 +0200 |
| commit | c94a1e6158ec63fdbbdf3886d24243a999d3e724 (patch) | |
| tree | 02a087027ffaa73d6112994f1a449a09e8c0e95e /pkgs | |
| parent | 34a71a80b8fb74cb07b7239845a667172e0d374f (diff) | |
| parent | a0502800cf4927d16285eb1a731f82b859d340e9 (diff) | |
| download | nixlib-c94a1e6158ec63fdbbdf3886d24243a999d3e724.tar nixlib-c94a1e6158ec63fdbbdf3886d24243a999d3e724.tar.gz nixlib-c94a1e6158ec63fdbbdf3886d24243a999d3e724.tar.bz2 nixlib-c94a1e6158ec63fdbbdf3886d24243a999d3e724.tar.lz nixlib-c94a1e6158ec63fdbbdf3886d24243a999d3e724.tar.xz nixlib-c94a1e6158ec63fdbbdf3886d24243a999d3e724.tar.zst nixlib-c94a1e6158ec63fdbbdf3886d24243a999d3e724.zip | |
Merge pull request #39987 from Ma27/yubikey-personalization-gui/qt5-port
yubikey-personalization-gui: port to qt5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/yubikey-personalization-gui/default.nix | 6 | ||||
| -rw-r--r-- | 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 e6a1c93d2bb6..d507816dbd38 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 fdaf166d5363..849a90cd6f96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12002,7 +12002,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 { }; |