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: 92537b01792f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f982aa04ac58
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 9, 2019

  1. yubioath-desktop: prefix QML2_IMPORT_PATH 

    Otherwise, yubioath-desktop can't find pyothersides qml files:

QQmlApplicationEngine failed to load component
qrc:/qml/main.qml:168 Type YubiKey unavailable
qrc:/qml/YubiKey.qml:2 module "io.thp.pyotherside" is not installed

[1]    17017 segmentation fault  result/bin/yubioath-desktop
    @flokli
    flokli committed Mar 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Synthetica9 Patrick Hilhorst
    GPG key ID: 589BB0A8DAFEF2B2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bfc5905 View commit details

Commits on Mar 10, 2019

  1. Merge pull request #57122 from flokli/yubioath-desktop-qml2 

    yubioath-desktop: prefix QML2_IMPORT_PATH
    @Mic92
    Mic92 authored Mar 10, 2019
    Copy the full SHA
    f982aa0 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/applications/misc/yubioath-desktop/default.nix
3 changes: 2 additions & 1 deletion pkgs/applications/misc/yubioath-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

doCheck = false;

buildInputs = [ stdenv qtbase qtquickcontrols pyotherside python3 ];
buildInputs = [ stdenv qtbase qtquickcontrols python3 ];

nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ];

@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
buildPythonPath "$out $pythonPath"
wrapProgram $out/bin/yubioath-desktop \
--prefix PYTHONPATH : "$program_PYTHONPATH" \
--prefix QML2_IMPORT_PATH : "${pyotherside}/${qtbase.qtQmlPrefix}" \
--prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib"