Merge pull request #62261 from bricewge/ykman-gui-otp

yubikey-manager-gui: revert part of 2e359d9
NixOS · May 31, 2019 · 0c6fb79 · 0c6fb79
2 parents f3eaa07 + 5aa3350
commit 0c6fb79
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix
@@ -46,12 +46,11 @@ in stdenv.mkDerivation rec {
 
   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 LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \
       --prefix PYTHONPATH : "$program_PYTHONPATH" \
       --set QML2_IMPORT_PATH "${qml2ImportPath}" \
       --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms \