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
This commit is contained in:
parent
25e4e7af03
commit
6f7f5bc823
|
@ -1,6 +1,7 @@
|
||||||
{ stdenv
|
{ stdenv
|
||||||
, lib
|
, lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, asciidoc
|
, asciidoc
|
||||||
, cmake
|
, cmake
|
||||||
, docbook_xsl
|
, docbook_xsl
|
||||||
|
@ -23,6 +24,16 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "168jg8kjbylfgalhicn0llbykd7kdc9id2989gg0nxlgmnvzl58a";
|
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 ];
|
nativeBuildInputs = [ asciidoc cmake docbook_xsl pkg-config ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
Loading…
Reference in a new issue