colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xorg.xf86videoopenchrome: pull upstream fix for -fno-common toolchain (#176074)

Browse Source 
* xorg.xf86videoopenchrome: pull upstream fix for -fno-common toolchain

Without the chage build fails on upstream gcc-10 as:

    ld: .libs/via_xvmc.o:/build/xf86-video-openchrome-0.6.0/src/via_vt1632.h:47: multiple definition of
      `via_vt1632_funcs'; .libs/via_analog.o:/build/xf86-video-openchrome-0.6.0/src/via_vt1632.h:47: first defined here

* Update pkgs/servers/x11/xorg/overrides.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Sergei Trofimovich 2022-06-03 15:13:23 +00:00 committed by GitHub
parent 6daa6cabc9
commit f6df882131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/x11/xorg/overrides.nix
View File

@ -878,6 +878,14 @@ self: super:
xf86videoopenchrome = super.xf86videoopenchrome.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ self.libXv ];
patches = [
# Pull upstream fix for -fno-common toolchains.
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/freedesktop/openchrome-xf86-video-openchrome/commit/edb46574d4686c59e80569ba236d537097dcdd0e.patch";
sha256 = "0xqawg9zzwb7x5vaf3in60isbkl3zfjq0wcnfi45s3hiii943sxz";
})
];
});
xf86videoxgi = super.xf86videoxgi.overrideAttrs (attrs: {