public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

Browse Source 
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
This commit is contained in:
Shea Levy
2015-02-02 21:14:28 -05:00
parent acbf8eb561 cfb29ab882
commit c45372f038
153 changed files with 419 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/misc/ccache/default.nix
View File

@@ -17,19 +17,19 @@ stdenv.mkDerivation {
links = extraConfig : (runCommand "ccache-links" { }
''
mkdir -p $out/bin
if [ -x "${gcc.gcc}/bin/gcc" ]; then
if [ -x "${gcc.cc}/bin/gcc" ]; then
cat > $out/bin/gcc << EOF
#!/bin/sh
${extraConfig}
exec ${ccache}/bin/ccache ${gcc.gcc}/bin/gcc "\$@"
exec ${ccache}/bin/ccache ${gcc.cc}/bin/gcc "\$@"
EOF
chmod +x $out/bin/gcc
fi
if [ -x "${gcc.gcc}/bin/g++" ]; then
if [ -x "${gcc.cc}/bin/g++" ]; then
cat > $out/bin/g++ << EOF
#!/bin/sh
${extraConfig}
exec ${ccache}/bin/ccache ${gcc.gcc}/bin/g++ "\$@"
exec ${ccache}/bin/ccache ${gcc.cc}/bin/g++ "\$@"
EOF
chmod +x $out/bin/g++
fi

4
pkgs/development/tools/misc/distcc/default.nix
View File

@@ -44,7 +44,7 @@ let
links = extraConfig : (runCommand "distcc-links" { }
''
mkdir -p $out/bin
if [ -x "${gcc.gcc}/bin/gcc" ]; then
if [ -x "${gcc.cc}/bin/gcc" ]; then
cat > $out/bin/gcc << EOF
#!/bin/sh
${extraConfig}
@@ -52,7 +52,7 @@ let
EOF
chmod +x $out/bin/gcc
fi
if [ -x "${gcc.gcc}/bin/g++" ]; then
if [ -x "${gcc.cc}/bin/g++" ]; then
cat > $out/bin/g++ << EOF
#!/bin/sh
${extraConfig}

2
pkgs/development/tools/misc/saleae-logic/default.nix
View File

@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
# Patch it
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic"
patchelf --set-rpath "${stdenv.cc.gcc}/lib:${stdenv.cc.gcc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic"
patchelf --set-rpath "${stdenv.cc.cc}/lib:${stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic"
# Build the LD_PRELOAD library that makes Logic work from a read-only directory
mkdir -p "$out/lib"