mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 20:49:52 +03:00
x11vnc: pull upstream fix for -fno-common toolchains
Without the change build fails on upstream gcc-10 as: ld: x11vnc-xwrappers.o:/build/source/src/util.h:105: multiple definition of `clientMutex'; x11vnc-8to24.o:/build/source/src/util.h:105: first defined here
This commit is contained in:
parent
236cc2971a
commit
42b9836536
@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a.patch";
|
||||
sha256 = "0hdhp32g2i5m0ihmaxkxhsn3d5f2qasadvwpgxify4xnzabmyb2d";
|
||||
})
|
||||
|
||||
# Pull upstream fix for -fno-common toolchains:
|
||||
# https://github.com/LibVNC/x11vnc/pull/121
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/LibVNC/x11vnc/commit/a48b0b1cd887d7f3ae67f525d7d334bd2feffe60.patch";
|
||||
sha256 = "046gjsmg0vm0m4y9ny17y2jayc4ba7vib2whw71l5x1hjp6pksjs";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
Loading…
Reference in New Issue
Block a user