cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

xwinmosaic: pull upstream fix for -fno-common toolchains

Browse source 
Without the change build fails as:

    $ nix build --impure --expr 'with import ./. {}; xwinmosaic.overrideAttrs (oa: {   NIX_CFLAGS_COMPILE = (oa.NIX_CFLAGS_COMPILE or "") + "-fno-common"; })'
    ld: CMakeFiles/xwinmosaic.dir/main.c.o:(.bss+0xc0):
      multiple definition of `a_NET_CURRENT_DESKTOP'; CMakeFiles/xwinmosaic.dir/x_interaction.c.o:(.bss+0xc0): first defined here
    ld: CMakeFiles/xwinmosaic.dir/main.c.o:(.bss+0xc8):
      multiple definition of `a_NET_DESKTOP_VIEWPORT'; CMakeFiles/xwinmosaic.dir/x_interaction.c.o:(.bss+0xc8): first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-07 22:00:28 +01:00
parent 9efbb7e316
commit 5bfd8093b7
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/X11/xwinmosaic/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkg-config, libXdamage }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, gtk2, cmake, pkg-config, libXdamage }:
stdenv.mkDerivation rec {
version = "0.4.2";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr";
};
patches = [
# Pull upstream fix for -fno-common toolchains like upstream gcc-10:
# https://github.com/soulthreads/xwinmosaic/pull/33
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/soulthreads/xwinmosaic/commit/a193a3f30850327066e5a93b29316cba2735e10d.patch";
sha256 = "0qpk802j5x6bsfvj6jqw1nz482jynwyk7yrrh4bsziwc53khm95q";
})
];
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ gtk2 libXdamage ];