Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f3eaa070aa31
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0c6fb79dd70d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 31, 2019

  1. yubikey-manager-gui: revert part of 2e359d9 

    Fixes #62210
    @bricewge
    bricewge committed May 31, 2019
    Copy the full SHA
    5aa3350 View commit details

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

    yubikey-manager-gui: revert part of 2e359d9
    @Mic92
    Mic92 authored May 31, 2019
    Copy the full SHA
    0c6fb79 View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 pkgs/tools/misc/yubikey-manager-qt/default.nix
3 changes: 1 addition & 2 deletions pkgs/tools/misc/yubikey-manager-qt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 \