Unverified Commit d77928b9 authored by Luke Granger-Brown's avatar Luke Granger-Brown Committed by GitHub
Browse files

Merge pull request #208279 from Kranzes/yubioath 

yubioath-flutter: slight refactor and cleanup
parents a6b1de79 88d6c7c7

pkgs/applications/misc/yubioath-flutter/default.nix

+37 −20
Original line number Diff line number Diff line
@@ -5,53 +5,70 @@ 
, stdenv

, pcre2

}:



let

  vendorHashes = {

    x86_64-linux = "sha256-BwhWA8N0S55XkljDKPNkDhsj0QSpmJJ5MwEnrPjymS8=";

    aarch64-linux = "sha256-T1aGz3+2Sls+rkUVDUo39Ky2igg+dxGSUaf3qpV7ovQ=";

  };



in

flutter.mkFlutterApp rec {

  pname = "yubioath-flutter";

  version = "6.0.2";



  src = fetchFromGitHub {

    owner = "Yubico";

    repo = "yubioath-flutter";

    rev = version;

    sha256 = "13nh5qpq02c6azfdh4cbzhlrq0hs9is45q5z5cnxg84hrx26hd4k";

  };

  meta = with lib; {

    description = "Yubico Authenticator for Desktop";

    homepage = "https://github.com/Yubico/yubioath-flutter";

    license = licenses.asl20;

    maintainers = with maintainers; [ lukegb ];

    platforms = builtins.attrNames vendorHashes;

  };



  helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; };

in

flutter.mkFlutterApp rec {

  pname = "yubioath-flutter";

  inherit src version meta;



  passthru.helper = helper;

  passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; };



  vendorHash = vendorHashes."${stdenv.system}";

  vendorHash = vendorHashes.${stdenv.system};



  postPatch = ''

    substituteInPlace linux/CMakeLists.txt \

      --replace "../build/linux/helper" "${helper}/libexec/helper"

      --replace "../build/linux/helper" "${passthru.helper}/libexec/helper"

  '';



  preInstall = ''

    # Make sure we have permission to delete things CMake has copied in to our build directory from elsewhere.

    chmod -R +w build/

    chmod -R +w build

  '';



  postInstall = ''

    # Swap the authenticator-helper symlink with the correct symlink.

    ln -fs "${helper}/bin/authenticator-helper" "$out/app/helper/authenticator-helper"

    ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/helper/authenticator-helper"



    # Move the icon.

    mkdir $out/share/icons

    mv $out/app/linux_support/com.yubico.yubioath.png $out/share/icons



    # Cleanup.

    rm -rf \

      "$out/app/README.adoc" \

      "$out/app/desktop_integration.sh" \

      "$out/app/linux_support" \

      $out/bin/* # We will repopulate this directory later.



    # Symlink binary.

    ln -sf "$out/app/authenticator" "$out/bin/yubioath-flutter"



    # Set the correct path to the binary in desktop file.

    substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \

      --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \

      --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png"

  '';



  buildInputs = [

    pcre2

  ];



  meta = with lib; {

    description = "Yubico Authenticator for Desktop";

    homepage = "https://github.com/Yubico/yubioath-flutter";

    license = licenses.asl20;

    maintainers = with maintainers; [ lukegb ];

    platforms = builtins.attrNames vendorHashes;

  };

}

pkgs/applications/misc/yubioath-flutter/helper.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
, meta

}:



buildPythonApplication rec {

buildPythonApplication {

  pname = "yubioath-flutter-helper";

  inherit src version meta;