jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39987 from Ma27/yubikey-personalization-gui/qt5-port

Browse Source 
yubikey-personalization-gui: port to qt5
This commit is contained in:
xeji 2018-05-05 11:40:13 +02:00 committed by GitHub
commit c94a1e6158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/misc/yubikey-personalization-gui/default.nix
View File

@ -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

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };