2 files changed, 132 insertions, 26 deletions

diff --git a/overlays/keepassxc/database-open-dialog.patch b/overlays/keepassxc/database-open-dialog.patch
index 4916dc1b..dff84846 100644
--- a/overlays/keepassxc/database-open-dialog.patch
+++ b/overlays/keepassxc/database-open-dialog.patch
@@ -1,7 +1,8 @@
-diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/BrowserService.cpp
---- source.orig/src/browser/BrowserService.cpp  2025-01-27 20:55:04.128198171 +0100
-+++ source/src/browser/BrowserService.cpp       2025-01-27 21:16:07.068959077 +0100
-@@ -249,7 +249,7 @@
+diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
+index 60412b5a..c0497d91 100644
+--- a/src/browser/BrowserService.cpp
++++ b/src/browser/BrowserService.cpp
+@@ -249,7 +249,7 @@ QJsonObject BrowserService::createNewGroup(const QString& groupName)
          return result;
      }
  
@@ -10,7 +11,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse
                                              tr("KeePassXC - Create a new group"),
                                              tr("A request for creating a new group \"%1\" has been received.\n"
                                                 "Do you want to create this group?\n")
-@@ -422,7 +422,7 @@
+@@ -422,7 +422,7 @@ QList<Entry*> BrowserService::confirmEntries(QList<Entry*>& entriesToConfirm,
  
      m_dialogActive = true;
      updateWindowState();
@@ -19,7 +20,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse
  
      connect(m_currentDatabaseWidget, SIGNAL(databaseLockRequested()), &accessControlDialog, SLOT(reject()));
  
-@@ -512,7 +512,7 @@
+@@ -512,7 +512,7 @@ QString BrowserService::storeKey(const QString& key)
      QString id;
  
      do {
@@ -28,7 +29,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse
          connect(m_currentDatabaseWidget, SIGNAL(databaseLockRequested()), &keyDialog, SLOT(reject()));
          keyDialog.setWindowTitle(tr("KeePassXC - New key association request"));
          keyDialog.setLabelText(tr("You have received an association request for the following database:\n%1\n\n"
-@@ -535,7 +535,7 @@
+@@ -535,7 +535,7 @@ QString BrowserService::storeKey(const QString& key)
  
          contains = db->metadata()->customData()->contains(CustomData::BrowserKeyPrefix + id);
          if (contains) {
@@ -37,7 +38,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse
                                                 tr("KeePassXC - Overwrite existing key?"),
                                                 tr("A shared encryption key with the name \"%1\" "
                                                    "already exists.\nDo you want to overwrite it?")
-@@ -595,7 +595,7 @@
+@@ -595,7 +595,7 @@ QJsonObject BrowserService::showPasskeysRegisterPrompt(const QJsonObject& public
      const auto existingEntries = getPasskeyEntriesWithUserHandle(rpId, userId, keyList);
  
      raiseWindow();
@@ -46,7 +47,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse
      confirmDialog.registerCredential(username, rpId, existingEntries, timeout);
  
      auto dialogResult = confirmDialog.exec();
-@@ -612,7 +612,7 @@
+@@ -612,7 +612,7 @@ QJsonObject BrowserService::showPasskeysRegisterPrompt(const QJsonObject& public
              // If no entry is selected, show the import dialog for manual entry selection
              auto selectedEntry = confirmDialog.getSelectedEntry();
              if (!selectedEntry) {
@@ -55,7 +56,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse
                  const auto result = passkeyImporter.showImportDialog(db,
                                                                       nullptr,
                                                                       origin,
-@@ -683,7 +683,7 @@
+@@ -683,7 +683,7 @@ QJsonObject BrowserService::showPasskeysAuthenticationPrompt(const QJsonObject&
      const auto timeout = publicKeyOptions["timeout"].toInt();
  
      raiseWindow();
@@ -64,7 +65,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse
      confirmDialog.authenticateCredential(entries, rpId, timeout);
      auto dialogResult = confirmDialog.exec();
      if (dialogResult == QDialog::Accepted) {
-@@ -760,7 +760,7 @@
+@@ -760,7 +760,7 @@ void BrowserService::addPasskeyToEntry(Entry* entry,
  
      // Ask confirmation if entry already contains a Passkey
      if (entry->hasPasskey()) {
@@ -73,7 +74,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse
                                   tr("KeePassXC - Update passkey"),
                                   tr("Entry already has a passkey.\nDo you want to overwrite the passkey in %1 - %2?")
                                       .arg(entry->title(), passkeyUtils()->getUsernameFromEntry(entry)),
-@@ -873,7 +873,7 @@
+@@ -873,7 +873,7 @@ bool BrowserService::updateEntry(const EntryParameters& entryParameters, const Q
          MessageBox::Button dialogResult = MessageBox::No;
          if (!browserSettings()->alwaysAllowUpdate()) {
              raiseWindow();
@@ -82,7 +83,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse
                                                  tr("KeePassXC - Update Entry"),
                                                  tr("Do you want to update the information in %1 - %2?")
                                                      .arg(QUrl(entryParameters.siteUrl).host(), username),
-@@ -909,7 +909,7 @@
+@@ -909,7 +909,7 @@ bool BrowserService::deleteEntry(const QString& uuid)
          return false;
      }
  
@@ -91,7 +92,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse
                                              tr("KeePassXC - Delete entry"),
                                              tr("A request for deleting entry \"%1\" has been received.\n"
                                                 "Do you want to delete the entry?\n")
-@@ -1536,7 +1536,7 @@
+@@ -1536,7 +1536,7 @@ QSharedPointer<Database> BrowserService::selectedDatabase()
          }
      }
  
@@ -100,10 +101,11 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse
      int openDatabaseCount = browserEntrySaveDialog.setItems(databaseWidgets, m_currentDatabaseWidget);
      if (openDatabaseCount > 1) {
          int res = browserEntrySaveDialog.exec();
-diff -u3 -r source.orig/src/fdosecrets/objects/Prompt.cpp source/src/fdosecrets/objects/Prompt.cpp
---- source.orig/src/fdosecrets/objects/Prompt.cpp       2025-01-27 20:55:04.135942791 +0100
-+++ source/src/fdosecrets/objects/Prompt.cpp    2025-01-27 21:01:37.166710935 +0100
-@@ -313,7 +313,7 @@
+diff --git a/src/fdosecrets/objects/Prompt.cpp b/src/fdosecrets/objects/Prompt.cpp
+index e89cd499..347c98b8 100644
+--- a/src/fdosecrets/objects/Prompt.cpp
++++ b/src/fdosecrets/objects/Prompt.cpp
+@@ -313,7 +313,7 @@ namespace FdoSecrets
          if (!entries.isEmpty()) {
              QString app = tr("%1 (PID: %2)").arg(client->name()).arg(client->pid());
              auto ac = new AccessControlDialog(
@@ -112,10 +114,11 @@ diff -u3 -r source.orig/src/fdosecrets/objects/Prompt.cpp source/src/fdosecrets/
              connect(ac, &AccessControlDialog::finished, this, &UnlockPrompt::itemUnlockFinished);
              connect(ac, &AccessControlDialog::finished, ac, &AccessControlDialog::deleteLater);
              ac->open();
-diff -u3 -r source.orig/src/gui/DatabaseTabWidget.cpp source/src/gui/DatabaseTabWidget.cpp
---- source.orig/src/gui/DatabaseTabWidget.cpp   2025-01-27 20:55:04.134589500 +0100
-+++ source/src/gui/DatabaseTabWidget.cpp        2025-01-27 21:07:09.785284837 +0100
-@@ -41,7 +41,7 @@
+diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
+index 805d4eab..4836199e 100644
+--- a/src/gui/DatabaseTabWidget.cpp
++++ b/src/gui/DatabaseTabWidget.cpp
+@@ -41,7 +41,7 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent)
      : QTabWidget(parent)
      , m_dbWidgetStateSync(new DatabaseWidgetStateSync(this))
      , m_dbWidgetPendingLock(nullptr)
diff --git a/overlays/keepassxc/default.nix b/overlays/keepassxc/default.nix
index 25429a66..f8d6cb07 100644
--- a/overlays/keepassxc/default.nix
+++ b/overlays/keepassxc/default.nix
@@ -1,8 +1,111 @@
-{ final, prev, ... }:
+{ final, prev, flakeInputs, ... }:
 {
-  keepassxc = prev.keepassxc.overrideAttrs (oldAttrs: {
-    patches = (oldAttrs.patches or []) ++ [
-      ./database-open-dialog.patch
+  keepassxc = final.stdenv.mkDerivation (finalAttrs: {
+    pname = "keepassxc";
+    version = "2.8.0-beta1";
+
+    src = final.fetchFromGitHub {
+      owner = "keepassxreboot";
+      repo = "keepassxc";
+      tag = finalAttrs.version;
+      hash = "sha256-fksThYmGZed66zxGDxlS2SHQzJYRf+T9AuZPbaNZV5Y=";
+    };
+
+    env =
+      final.lib.optionalAttrs final.stdenv.cc.isClang {
+        NIX_CFLAGS_COMPILE = toString [
+          "-Wno-old-style-cast"
+          "-Wno-error"
+          "-D__BIG_ENDIAN__=${if final.stdenv.hostPlatform.isBigEndian then "1" else "0"}"
+        ];
+      };
+
+    # Upstream develops against a build of PCSC from Xcode.
+    # The types are incompatible with nixpkgs pcsclite.
+    # https://github.com/NixOS/nixpkgs/issues/520227
+    postPatch = ''
+      substituteInPlace src/keys/drivers/YubiKeyInterfacePCSC.cpp \
+        --replace-fail "typedef uint32_t RETVAL;" "typedef int32_t RETVAL;"
+    '';
+
+    cmakeFlags = [
+      (final.lib.cmakeFeature "KEEPASSXC_BUILD_TYPE" "Release")
+      (final.lib.cmakeBool "WITH_GUI_TESTS" true)
+      (final.lib.cmakeBool "WITH_XC_UPDATECHECK" false)
+      (final.lib.cmakeBool "WITH_XC_X11" false)
+      (final.lib.cmakeBool "WITH_XC_BROWSER" true)
+      (final.lib.cmakeBool "WITH_XC_BROWSER_PASSKEYS" true)
+      (final.lib.cmakeBool "WITH_XC_KEESHARE" true)
+      (final.lib.cmakeBool "WITH_XC_NETWORKING" true)
+      (final.lib.cmakeBool "WITH_XC_SSHAGENT" true)
+      (final.lib.cmakeBool "WITH_XC_FDOSECRETS" true)
+      (final.lib.cmakeBool "WITH_XC_YUBIKEY" true)
+    ];
+
+    doCheck = true;
+    checkPhase =
+      let
+        disabledTests = final.lib.concatStringsSep "|" (
+          [
+            # flaky
+            "testcli"
+            "testgui"
+          ]
+        );
+      in
+      ''
+        runHook preCheck
+
+        export LC_ALL="en_US.UTF-8"
+        export QT_QPA_PLATFORM=offscreen
+        export QT_PLUGIN_PATH="${final.qt6.qtbase}/${final.qt6.qtbase.qtPluginPrefix}"
+
+        make test ARGS+="-E '${disabledTests}' --output-on-failure"
+
+        runHook postCheck
+      '';
+
+    nativeBuildInputs = with final; [
+      asciidoctor
+      cmake
+      qt6.wrapQtAppsHook
+      qt6.qttools
+      pkg-config
+      wrapGAppsHook3
+    ];
+
+    dontWrapGApps = true;
+    preFixup = ''
+      qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    '';
+
+    postInstall = final.lib.concatLines [
+      # See https://github.com/keepassxreboot/keepassxc/blob/cd7a53abbbb81e468efb33eb56eefc12739969b8/src/browser/NativeMessageInstaller.cpp#L317
+      # See https://github.com/keepassxreboot/keepassxc/blob/cd7a53abbbb81e468efb33eb56eefc12739969b8/utils/keepassxc-snap-helper.sh#L48-L58
+      ''
+        mkdir -p "$out/lib/mozilla/native-messaging-hosts"
+        substituteAll "${toString (flakeInputs.nixpkgs) + "/pkgs/by-name/ke/keepassxc/firefox-native-messaging-host.json"}" "$out/lib/mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json"
+
+        mkdir -p "$out/etc/chromium/native-messaging-hosts"
+        substituteAll "${toString (flakeInputs.nixpkgs) + "/pkgs/by-name/ke/keepassxc/chromium-native-messaging-host.json"}" "$out/etc/chromium/native-messaging-hosts/org.keepassxc.keepassxc_browser.json"
+      ''
+    ];
+
+    buildInputs = with final; [
+      botan3
+      curl
+      libxi
+      libxtst
+      libargon2
+      qt6.qtbase
+      qt6.qtsvg
+      minizip
+      pcsclite
+      qrencode
+      readline
+      zlib
+      libusb1
+      keyutils
     ];
   });
 }