about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-09-23 20:47:27 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-09-23 20:48:14 -0700
commit5856e44258166d261698aae54c3992e87c495fe1 (patch)
treef8fadf834108c72897334c318558a39b00b69506 /pkgs/development/compilers
parent7c149b86c3c2e84a07c7eb575e23c64878507fc8 (diff)
downloadnixlib-5856e44258166d261698aae54c3992e87c495fe1.tar
nixlib-5856e44258166d261698aae54c3992e87c495fe1.tar.gz
nixlib-5856e44258166d261698aae54c3992e87c495fe1.tar.bz2
nixlib-5856e44258166d261698aae54c3992e87c495fe1.tar.lz
nixlib-5856e44258166d261698aae54c3992e87c495fe1.tar.xz
nixlib-5856e44258166d261698aae54c3992e87c495fe1.tar.zst
nixlib-5856e44258166d261698aae54c3992e87c495fe1.zip
jemalloc: Fix jemalloc prefix for applications which expect ^malloc
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/rustc/generic.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index 9df259cee8e2..8b3c61d52715 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -138,6 +138,10 @@ stdenv.mkDerivation {
     sed -i configure \
       -e '/probe_need CFG_CURLORWGET/d'
 
+    # Fix the use of jemalloc prefixes which our jemalloc doesn't have
+    [ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
+    [ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
+
     # Useful debugging parameter
     #export VERBOSE=1
   '';