ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

orig-gcc -> orig-cc

Browse Source
This commit is contained in:
Eelco Dolstra 2015-03-04 22:15:10 +01:00
parent 694f01db2d
commit 6f33aa8465
18 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram "$out/bin/mysql-workbench" \ wrapProgram "$out/bin/mysql-workbench" \
--prefix LD_LIBRARY_PATH : "${python}/lib" \ --prefix LD_LIBRARY_PATH : "${python}/lib" \
--prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64" \ --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \
--prefix PATH : "${gnome_keyring}/bin" \ --prefix PATH : "${gnome_keyring}/bin" \
--prefix PATH : "${python}/bin" \ --prefix PATH : "${python}/bin" \
--set PYTHONPATH $PYTHONPATH \ --set PYTHONPATH $PYTHONPATH \

2
pkgs/applications/networking/instant-messengers/teamspeak/client.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
echo "patching ts3client..." echo "patching ts3client..."
patchelf \ patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \ --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
--force-rpath \ --force-rpath \
ts3client ts3client
''; '';

2
pkgs/applications/networking/instant-messengers/teamspeak/server.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation {
echo "patching ts3server" echo "patching ts3server"
patchelf \ patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \ --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
--force-rpath \ --force-rpath \
ts3server ts3server
''; '';

2
pkgs/applications/taxes/aangifte-2007/builder.sh
View File

@ -6,7 +6,7 @@ buildPhase() {
for i in bin/*; do for i in bin/*; do
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i $i
done done
} }

2
pkgs/applications/taxes/aangifte-2008/builder.sh
View File

@ -6,7 +6,7 @@ buildPhase() {
for i in bin/*; do for i in bin/*; do
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i $i
done done
} }

2
pkgs/applications/taxes/aangifte-2009/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation {
for i in bin/*; do for i in bin/*; do
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i $i
done done
''; '';

2
pkgs/applications/taxes/aangifte-2010/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation {
for i in bin/*; do for i in bin/*; do
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i $i
done done
''; '';

2
pkgs/applications/taxes/aangifte-2011/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation {
for i in bin/*; do for i in bin/*; do
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i $i
done done
''; '';

4
pkgs/applications/taxes/aangifte-2012/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation {
for i in bin/*; do for i in bin/*; do
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i $i
done done
''; '';
@ -28,7 +28,7 @@ stdenv.mkDerivation {
mkdir -p $out mkdir -p $out
cp -prvd * $out/ cp -prvd * $out/
wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \ wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \
--prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-gcc)/lib/libgcc_s.so.1 --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
''; '';
meta = { meta = {

4
pkgs/applications/taxes/aangifte-2013/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation {
for i in bin/*; do for i in bin/*; do
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
$i $i
done done
''; '';
@ -28,7 +28,7 @@ stdenv.mkDerivation {
mkdir -p $out mkdir -p $out
cp -prvd * $out/ cp -prvd * $out/
wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \ wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \
--prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-gcc)/lib/libgcc_s.so.1 --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
''; '';
meta = { meta = {

2
pkgs/build-support/gcc-cross-wrapper/builder.sh
View File

@ -109,7 +109,7 @@ chmod +x "$out/bin/$crossConfig-ld"
# Emit a setup hook. Also store the path to the original GCC and # Emit a setup hook. Also store the path to the original GCC and
# Glibc. # Glibc.
test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc
test -n "$libc" && echo $libc > $out/nix-support/orig-libc test -n "$libc" && echo $libc > $out/nix-support/orig-libc
doSubstitute "$addFlags" "$out/nix-support/add-flags" doSubstitute "$addFlags" "$out/nix-support/add-flags"

2
pkgs/build-support/gcc-wrapper-old/builder.sh
View File

@ -196,7 +196,7 @@ fi
# Emit a setup hook. Also store the path to the original GCC and # Emit a setup hook. Also store the path to the original GCC and
# Glibc. # Glibc.
test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc
test -n "$libc" && echo $libc > $out/nix-support/orig-libc test -n "$libc" && echo $libc > $out/nix-support/orig-libc
doSubstitute "$addFlags" "$out/nix-support/add-flags.sh" doSubstitute "$addFlags" "$out/nix-support/add-flags.sh"

2
pkgs/development/compilers/cudatoolkit/5.5.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
'{}' \; || true '{}' \; || true
find . -type f -exec patchelf \ find . -type f -exec patchelf \
--set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \
--force-rpath \ --force-rpath \
'{}' \; || true '{}' \; || true
''; '';

2
pkgs/development/compilers/cudatoolkit/6.0.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
'{}' \; || true '{}' \; || true
find . -type f -exec patchelf \ find . -type f -exec patchelf \
--set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \
--force-rpath \ --force-rpath \
'{}' \; || true '{}' \; || true
''; '';

2
pkgs/development/compilers/gnatboot/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation {
set +e set +e
for a in $out/bin/* ; do for a in $out/bin/* ; do
patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib $a --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a
done done
set -e set -e
mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc

2
pkgs/development/tools/misc/cflow/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
substituteInPlace "src/cflow.h" \ substituteInPlace "src/cflow.h" \
--replace "/usr/bin/cpp" \ --replace "/usr/bin/cpp" \
"$(cat ${stdenv.cc}/nix-support/orig-gcc)/bin/cpp" "$(cat ${stdenv.cc}/nix-support/orig-cc)/bin/cpp"
''; '';
buildInputs = [ gettext ] ++ buildInputs = [ gettext ] ++

2
pkgs/development/tools/selenium/chromedriver/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
mv chromedriver $out/bin mv chromedriver $out/bin
patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
wrapProgram "$out/bin/chromedriver" \ wrapProgram "$out/bin/chromedriver" \
--prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH" --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/games/castle-combat/default.nix
View File

@ -39,8 +39,8 @@ buildPythonPackage rec {
fixLoaderPath = fixLoaderPath =
let dollar = "\$"; in let dollar = "\$"; in
'' sed -i "$out/bin/castle-combat" \ '' sed -i "$out/bin/castle-combat" \
-e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\ -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\
export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\"" export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\""
''; '';
# ^ # ^
# `--- The run-time says: "libgcc_s.so.1 must be installed for # `--- The run-time says: "libgcc_s.so.1 must be installed for