From 94a5ae4f9100d3480e490b556ff89cf17c9e5490 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 22 May 2022 14:37:30 +0100 Subject: [PATCH] mni_autoreg: pull upstream workaround for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: lib_minctracc.a(minctracclib.c.o):(.bss+0x78): multiple definition of `prog_name'; CMakeFiles/xfm2param.dir/Extra_progs/xfm2param.c.o:(.bss+0x18): first defined here --- .../science/biology/mni_autoreg/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix index b0ec8a70e149..d7882bd4854e 100644 --- a/pkgs/applications/science/biology/mni_autoreg/default.nix +++ b/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, perlPackages, libminc }: stdenv.mkDerivation rec { pname = "mni_autoreg"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0axl069nv57vmb2wvqq7s9v3bfxwspzmk37bxm4973ai1irgppjq"; }; + patches = [ + # Pull upstream workaround for -fno-common toolchains: + # https://github.com/BIC-MNI/mni_autoreg/pull/28 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/BIC-MNI/mni_autoreg/commit/06adfacbd84369ea3bcc4376596ac1c0f2e49af9.patch"; + sha256 = "004sdrbx9kcj1qqwjly6p03svakl0x2sbv83salyg63fv67jynx8"; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ libminc ]; propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ];