From 6f7f5bc8235a37214d92fb817a95d31af5f1e052 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 21 May 2022 11:28:13 +0100
Subject: lastpass-cli: fix build for -fno-common toolchains

Without the change build fails on upstream gcc-10:

    ld: CMakeFiles/lpass.dir/util.c.o:(.bss+0x8): multiple definition of
      `ARGC'; CMakeFiles/lpass.dir/agent.c.o:(.bss+0x8): first defined here
---
 pkgs/tools/security/lastpass-cli/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'pkgs/tools/security/lastpass-cli')

diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
index 3da3342e3794..14a6ef750e3a 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/pkgs/tools/security/lastpass-cli/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, fetchpatch
 , asciidoc
 , cmake
 , docbook_xsl
@@ -23,6 +24,16 @@ stdenv.mkDerivation rec {
     sha256 = "168jg8kjbylfgalhicn0llbykd7kdc9id2989gg0nxlgmnvzl58a";
   };
 
+  patches = [
+    # Pull fix pending upstream inclusion for -fno-common toolchains:
+    #   https://github.com/lastpass/lastpass-cli/pull/576
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/lastpass/lastpass-cli/commit/e3311cebdb29a3267843cf656a32f01c5062897e.patch";
+      sha256 = "1yjx2p98nb3n8ywc9lhf2zal5fswawb5i6lgnicdin23zngff5l8";
+    })
+  ];
+
   nativeBuildInputs = [ asciidoc cmake docbook_xsl pkg-config ];
 
   buildInputs = [
-- 
cgit 1.4.1