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

gerbv: pull fix pending upstream inclusion for -fno-common toolchains

Browse source 
Without the change build fails on upstream gcc-10 as:

    ld: interface.o:/build/gerbv/src/callbacks.h:50: multiple definition of
      `toggle_layer'; callbacks.o:/build/gerbv/src/callbacks.h:50: first defined here
    ld: interface.o:/build/gerbv/src/callbacks.h:44: multiple definition of
      `CALLBACKS_SAVE_FILE_TYPE'; callbacks.o:/build/gerbv/src/callbacks.h:44: first defined here
    ld: render.o:/build/gerbv/src/callbacks.h:44: multiple definition of
      `CALLBACKS_SAVE_FILE_TYPE'; callbacks.o:/build/gerbv/src/callbacks.h:44: first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-14 13:41:11 +01:00
parent 197681059f
commit 0b3eecc56f
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/applications/science/electronics/gerbv/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: { lib, stdenv, fetchgit, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "gerbv"; pname = "gerbv";
@ -10,6 +10,16 @@ stdenv.mkDerivation {
sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446";
}; };
patches = [
# Pull patch pending upstream inclusion for -fno-common toolchains:
# https://sourceforge.net/p/gerbv/patches/84/
(fetchpatch {
name = "fnoc-mmon.patch";
url = "https://sourceforge.net/p/gerbv/patches/84/attachment/0001-gerbv-fix-build-on-gcc-10-fno-common.patch";
sha256 = "1avfbkqhxl7wxn1z19y30ilkwvdgpdkzhzawrs5y3damxmqq8ggk";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ]; nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ];
buildInputs = [ gettext libtool cairo gtk2 ]; buildInputs = [ gettext libtool cairo gtk2 ];