Missed gcc refs
This commit is contained in:
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
|
||||
for f in $out/bin/*
|
||||
do
|
||||
wrapProgram $f \
|
||||
--prefix PATH : ${stdenv.gcc}/bin
|
||||
--prefix PATH : ${stdenv.cc}/bin
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
|
||||
|
||||
installPhase = ''
|
||||
export CC=cc
|
||||
'' + stdenv.lib.optionalString (stdenv ? gcc) ''
|
||||
'' + stdenv.lib.optionalString (stdenv ? cc) ''
|
||||
# http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html
|
||||
# Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work"
|
||||
# during tests:
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
assert stdenv.isLinux;
|
||||
|
||||
let
|
||||
realGcc = stdenv.gcc.gcc;
|
||||
realGcc = stdenv.cc.gcc;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patchShebangs . contrib
|
||||
|
||||
export PATH="$PATH:${stdenv.gcc.libc}/sbin"
|
||||
export PATH="$PATH:${stdenv.cc.libc}/sbin"
|
||||
|
||||
# ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
|
||||
# is probably not what we want anyway on non-NixOS
|
||||
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath
|
||||
[stdenv.gcc.gcc emacs tk tcl boost gmp];
|
||||
[stdenv.cc.gcc emacs tk tcl boost gmp];
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user