yubikey-personalization: pull upstream fix for -fno-common toolchains
Without the change build fails on upstream gcc-10 as: ld: ./.libs/libykpers_args.a(ykpers-args.o):/build/ykpers-1.20.0/ykpers-args.h:36: multiple definition of `usage'; ykpersonalize.o:/build/ykpers-1.20.0/ykpers-args.h:36: first defined here
This commit is contained in:
parent
115f2f7878
commit
d25d89dbe4
|
@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
|
||||||
url = "https://github.com/Yubico/yubikey-personalization/commit/0aa2e2cae2e1777863993a10c809bb50f4cde7f8.patch";
|
url = "https://github.com/Yubico/yubikey-personalization/commit/0aa2e2cae2e1777863993a10c809bb50f4cde7f8.patch";
|
||||||
sha256 = "1wnigf3hbq59i15kgxpq3pwrl1drpbj134x81mmv9xm1r44cjva8";
|
sha256 = "1wnigf3hbq59i15kgxpq3pwrl1drpbj134x81mmv9xm1r44cjva8";
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# Pull upstream fix for -fno-common toolchain support:
|
||||||
|
# https://github.com/Yubico/yubikey-personalization/issues/155
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fno-common.patch";
|
||||||
|
url = "https://github.com/Yubico/yubikey-personalization/commit/09ea16d9e2030e4da6ad00c1e5147e962aa7ff84.patch";
|
||||||
|
sha256 = "0n3ka8n7f3ndbxv3k0bi77d850kr2ypglkw81gqycpqyaciidqwa";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
Loading…
Reference in a new issue