diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
| commit | c45372f038bc89c69390bdbc6a4b0bfdb63b1423 (patch) | |
| tree | dc8ebe44d7a1ad0dc01b938199db38ebc14fbdfb /pkgs/applications/science | |
| parent | acbf8eb5617bb601e81cdc783f941773032cf400 (diff) | |
| parent | cfb29ab882323d379aba20a95020c7c24f883eae (diff) | |
| download | nixpkgs-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar nixpkgs-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.gz nixpkgs-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.bz2 nixpkgs-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.lz nixpkgs-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.xz nixpkgs-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.zst nixpkgs-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.zip | |
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/applications/science')
5 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix index dd8863b1c4e..e4cb4685f16 100644 --- a/pkgs/applications/science/electronics/eagle/default.nix +++ b/pkgs/applications/science/electronics/eagle/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { mkdir -p "$out"/bin cat > "$out"/bin/eagle << EOF #!${stdenv.shell} - export LD_LIBRARY_PATH="${stdenv.cc.gcc}/lib:${libPath}" + export LD_LIBRARY_PATH="${stdenv.cc.cc}/lib:${libPath}" export LD_PRELOAD="$out/lib/eagle_fixer.so" exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@" EOF diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 797333d5bd8..c0619ab5f49 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -5,9 +5,9 @@ assert stdenv.isLinux; let libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.gcc gtk gdk_pixbuf atk pango glib cairo + [ stdenv.cc.libc stdenv.cc.cc gtk gdk_pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview - ] + ":${stdenv.cc.gcc}/lib64"; + ] + ":${stdenv.cc.cc}/lib64"; patchExe = x: '' patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 8413eb14a35..05f18334b99 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { CXX=$(type -p g++) FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" JAVA_HOME="${jdk}" - LDFLAGS="-L${gfortran.gcc}/lib" + LDFLAGS="-L${gfortran.cc}/lib" RANLIB=$(type -p ranlib) R_SHELL="${stdenv.shell}" ) diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 64ebfb34636..c9357d7352f 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { coreutils fontconfig freetype - gcc.gcc + gcc.cc gcc.libc glib ncurses diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 587321f09ec..56e994258a6 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { coreutils fontconfig freetype - gcc.gcc + gcc.cc gcc.libc glib ncurses |