summary refs log tree commit diff
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-02-25 08:19:57 -0500
committerShea Levy <shea@shealevy.com>2018-02-25 08:19:57 -0500
commit538913cb906cf63199c902d318df731280f98caa (patch)
tree9a750bdecd5b49c6adff4585e817690647d41e4e
parent7e6921b5f9b97e70cdd016f743a31894e48d4cdd (diff)
parent168b131de4997433885aaf796896f636f40defef (diff)
downloadnixlib-538913cb906cf63199c902d318df731280f98caa.tar
nixlib-538913cb906cf63199c902d318df731280f98caa.tar.gz
nixlib-538913cb906cf63199c902d318df731280f98caa.tar.bz2
nixlib-538913cb906cf63199c902d318df731280f98caa.tar.lz
nixlib-538913cb906cf63199c902d318df731280f98caa.tar.xz
nixlib-538913cb906cf63199c902d318df731280f98caa.tar.zst
nixlib-538913cb906cf63199c902d318df731280f98caa.zip
Merge branch 'perl-gcc6-cross'
-rw-r--r--pkgs/development/interpreters/perl/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 14a4bac47f62..c1c92e6efdf2 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -133,7 +133,9 @@ let
       sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8";
     };
 
-    nativeBuildInputs = [ buildPackages.stdenv.cc ];
+    # Hacky! But not sure how else we can access a native-targeted gcc6
+    # https://github.com/arsv/perl-cross/issues/60
+    nativeBuildInputs = [ buildPackages.buildPackages.gcc6 ];
 
     postUnpack = ''
       unpackFile ${perl-cross-src}