Merge pull request #43858 from dtzWill/update/perl-cross-1.2
perl-cross: 1.1.8 -> 1.2, needed for newer perl versions
This commit is contained in:
commit
ce12ad3116
|
@ -156,26 +156,17 @@ let
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
} // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
|
} // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
|
||||||
crossVersion = "1.1.8";
|
crossVersion = "1.2";
|
||||||
|
|
||||||
perl-cross-src = fetchurlBoot {
|
perl-cross-src = fetchurlBoot {
|
||||||
url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz";
|
url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz";
|
||||||
sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8";
|
sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r";
|
||||||
};
|
|
||||||
|
|
||||||
# https://github.com/arsv/perl-cross/issues/60
|
|
||||||
perl-cross-gcc7-patch = fetchpatch {
|
|
||||||
url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch";
|
|
||||||
sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
|
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
unpackFile ${perl-cross-src}
|
unpackFile ${perl-cross-src}
|
||||||
cd perl-cross-*
|
|
||||||
patch -Np1 -i ${perl-cross-gcc7-patch}
|
|
||||||
cd ..
|
|
||||||
cp -R perl-cross-${crossVersion}/* perl-${version}/
|
cp -R perl-cross-${crossVersion}/* perl-${version}/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue