From ad30ed66ae188ada6d7581816f39f8f31c257715 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 11 Feb 2019 23:17:34 +0100 Subject: [PATCH 1/4] maintainers: add cbley --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8ccffd9139b..3558a50ba17 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -788,6 +788,11 @@ github = "caugner"; name = "Claas Augner"; }; + cbley = { + email = "claudio.bley@gmail.com"; + github = "avdv"; + name = "Claudio Bley"; + }; cdepillabout = { email = "cdep.illabout@gmail.com"; github = "cdepillabout"; From 41287824646d1bd178596a7aa793a34ce2829189 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Mon, 11 Feb 2019 23:21:53 +0100 Subject: [PATCH 2/4] yubikey-manager-qt: init at 1.1.0 --- .../tools/misc/yubikey-manager-qt/default.nix | 81 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/tools/misc/yubikey-manager-qt/default.nix diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix new file mode 100644 index 00000000000..a69ab50c7c1 --- /dev/null +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -0,0 +1,81 @@ +{ stdenv +, fetchurl +, makeWrapper +, pyotherside +, pythonPackages +, python3 +, qmake +, qt5 +, yubikey-manager +, yubikey-personalization +}: + +with import {}; + +let + qmlPath = qmlLib: "${qmlLib}/${qt5.qtbase.qtQmlPrefix}"; + + qml2ImportPath = lib.concatMapStringsSep ";" qmlPath [ + qt5.qtbase.bin qt5.qtdeclarative.bin pyotherside qt5.qtquickcontrols qt5.qtquickcontrols2.bin qt5.qtgraphicaleffects + ]; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "yubikey-manager-qt"; + version = "1.1.0"; + + src = fetchurl { + url = "https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-${version}.tar.gz"; + sha256 = "8049a233a8cca07543d745a9f619c0fc3afb324f5d0030b93f037b34ac1c5e66"; + }; + + nativeBuildInputs = [ makeWrapper python3.pkgs.wrapPython qmake ]; + + sourceRoot = "."; + + postPatch = '' + substituteInPlace ykman-gui/deployment.pri --replace '/usr/bin' "$out/bin" + ''; + + buildInputs = [ pythonPackages.python stdenv qt5.qtbase qt5.qtgraphicaleffects qt5.qtquickcontrols qt5.qtquickcontrols2 pyotherside ]; + + buildPhase = '' + qmake + make + ''; + + enableParallelBuilding = true; + + pythonPath = [ yubikey-manager ]; + + # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary + # support that the yubicommon library uses to load libykpers + postInstall = '' + buildPythonPath "$pythonPath" + + wrapProgram $out/bin/ykman-gui \ + --prefix PYTHONPATH : "$program_PYTHONPATH" \ + --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ + --set QML2_IMPORT_PATH "${qml2ImportPath}" \ + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ + --prefix QT_PLUGIN_PATH : "${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" + + mkdir -p $out/share/applications + cp resources/ykman-gui.desktop $out/share/applications/ykman-gui.desktop + mkdir -p $out/share/ykman-gui/icons + cp resources/icons/*.{icns,ico,png,xpm} $out/share/ykman-gui/icons + substituteInPlace $out/share/applications/ykman-gui.desktop \ + --replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui" \ + ''; + + meta = with stdenv.lib; { + inherit version; + description = ''Cross-platform application for configuring any YubiKey over all USB interfaces.''; + homepage = https://developers.yubico.com/yubikey-manager-qt/; + license = licenses.bsd2; + maintainers = [ maintainers.cbley ]; + platforms = platforms.linux; + homepage = "https://github.com/Yubico"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2a008b7c7e..8fc26657bfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13099,6 +13099,10 @@ in yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; + yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { + pythonPackages = python3Packages; + }; + yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { }; yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { From d89634ad55f96316ae0b8d6b7f6a1db929dce975 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 12 Feb 2019 07:17:59 +0100 Subject: [PATCH 3/4] fixup! yubikey-manager-qt: init at 1.1.0 --- pkgs/tools/misc/yubikey-manager-qt/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index a69ab50c7c1..a463faa4350 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , makeWrapper +, pcsclite , pyotherside , pythonPackages , python3 @@ -10,22 +11,21 @@ , yubikey-personalization }: -with import {}; +with stdenv; let qmlPath = qmlLib: "${qmlLib}/${qt5.qtbase.qtQmlPrefix}"; - qml2ImportPath = lib.concatMapStringsSep ";" qmlPath [ + qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [ qt5.qtbase.bin qt5.qtdeclarative.bin pyotherside qt5.qtquickcontrols qt5.qtquickcontrols2.bin qt5.qtgraphicaleffects ]; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "yubikey-manager-qt"; version = "1.1.0"; src = fetchurl { - url = "https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-${version}.tar.gz"; + url = "https://developers.yubico.com/yubikey-manager-qt/Releases/${pname}-${version}.tar.gz"; sha256 = "8049a233a8cca07543d745a9f619c0fc3afb324f5d0030b93f037b34ac1c5e66"; }; @@ -37,12 +37,7 @@ in stdenv.mkDerivation rec { substituteInPlace ykman-gui/deployment.pri --replace '/usr/bin' "$out/bin" ''; - buildInputs = [ pythonPackages.python stdenv qt5.qtbase qt5.qtgraphicaleffects qt5.qtquickcontrols qt5.qtquickcontrols2 pyotherside ]; - - buildPhase = '' - qmake - make - ''; + buildInputs = [ pythonPackages.python qt5.qtbase qt5.qtgraphicaleffects qt5.qtquickcontrols qt5.qtquickcontrols2 pyotherside ]; enableParallelBuilding = true; @@ -71,11 +66,10 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; - description = ''Cross-platform application for configuring any YubiKey over all USB interfaces.''; + description = "Cross-platform application for configuring any YubiKey over all USB interfaces."; homepage = https://developers.yubico.com/yubikey-manager-qt/; license = licenses.bsd2; maintainers = [ maintainers.cbley ]; platforms = platforms.linux; - homepage = "https://github.com/Yubico"; }; } From 703e8763d5d0eca99e0d86c22f4d863b903fbb0f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 15 Feb 2019 22:19:35 +0100 Subject: [PATCH 4/4] yubikey-manager-qt: cleanup * Explicitly specify all QT dependencies rather than import from the `qt5` attr set. This makes overrides of a single library easier. * Drop the superfluous `with stdenv` expression and reference lib or stdenv itself where possible. * Don't manually configure shared libraries to load. This is mostly done automatically during the build steps. --- .../tools/misc/yubikey-manager-qt/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index a463faa4350..c8521efb28d 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -6,18 +6,23 @@ , pythonPackages , python3 , qmake -, qt5 +, qtbase +, qtgraphicaleffects +, qtquickcontrols +, qtquickcontrols2 +, qtdeclarative +, qtsvg , yubikey-manager , yubikey-personalization }: -with stdenv; - let - qmlPath = qmlLib: "${qmlLib}/${qt5.qtbase.qtQmlPrefix}"; + qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; + + inherit (stdenv) lib; qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [ - qt5.qtbase.bin qt5.qtdeclarative.bin pyotherside qt5.qtquickcontrols qt5.qtquickcontrols2.bin qt5.qtgraphicaleffects + qtbase.bin qtdeclarative.bin pyotherside qtquickcontrols qtquickcontrols2.bin qtgraphicaleffects ]; in stdenv.mkDerivation rec { @@ -37,7 +42,7 @@ in stdenv.mkDerivation rec { substituteInPlace ykman-gui/deployment.pri --replace '/usr/bin' "$out/bin" ''; - buildInputs = [ pythonPackages.python qt5.qtbase qt5.qtgraphicaleffects qt5.qtquickcontrols qt5.qtquickcontrols2 pyotherside ]; + buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ]; enableParallelBuilding = true; @@ -50,11 +55,9 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/ykman-gui \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ - --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ --set QML2_IMPORT_PATH "${qml2ImportPath}" \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ - --prefix QT_PLUGIN_PATH : "${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms \ + --prefix QT_PLUGIN_PATH : "${qtsvg.bin}/${qtbase.qtPluginPrefix}" mkdir -p $out/share/applications cp resources/ykman-gui.desktop $out/share/applications/ykman-gui.desktop @@ -64,7 +67,7 @@ in stdenv.mkDerivation rec { --replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui" \ ''; - meta = with stdenv.lib; { + meta = with lib; { inherit version; description = "Cross-platform application for configuring any YubiKey over all USB interfaces."; homepage = https://developers.yubico.com/yubikey-manager-qt/;