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

mni_autoreg: pull upstream workaround for -fno-common toolchains

Browse Source 
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
This commit is contained in:
Sergei Trofimovich 2022-05-22 14:37:30 +01:00
parent e04ca59317
commit 94a5ae4f91
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/biology/mni_autoreg/default.nix
View File

@ -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 ];