diff options
author | Will Dietz <github@wdtz.org> | 2018-07-20 13:35:44 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-20 13:35:44 -0500 |
commit | ce12ad31169edfb1de911e54be9230b298e325f3 (patch) | |
tree | f5f3289f45f45b3c05a47cbe7bbc04b7ad696f38 /pkgs/development | |
parent | 55a12c97635868a45e1f9383d64389036a240b3f (diff) | |
parent | 063132c22c937253a13ce52281a3a18ffcf73351 (diff) |
Merge pull request #43858 from dtzWill/update/perl-cross-1.2
perl-cross: 1.1.8 -> 1.2, needed for newer perl versions
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 4deadefcc4bc0..08672d28a1f85 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -156,26 +156,17 @@ let platforms = platforms.all; }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.1.8"; + crossVersion = "1.2"; perl-cross-src = fetchurlBoot { url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz"; - sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; - }; - - # 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"; + sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; postUnpack = '' unpackFile ${perl-cross-src} - cd perl-cross-* - patch -Np1 -i ${perl-cross-gcc7-patch} - cd .. cp -R perl-cross-${crossVersion}/* perl-${version}/ ''; |