rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc

This commit is contained in:
Eric Seidel 2015-01-14 20:25:26 -08:00
parent 16fe4be790
commit f3c6827373
89 changed files with 137 additions and 138 deletions

View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.cc.libc}/lib:${qt48}/lib:${stdenv.cc.gcc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager --set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.cc.libc}/lib:${qt48}/lib:${stdenv.cc.cc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager
''; '';
dontPatchELF = true; dontPatchELF = true;

View file

@ -45,7 +45,7 @@ let
pango pango
qt4 qt4
sqlite sqlite
stdenv.cc.gcc stdenv.cc.cc
xlibs.libX11 xlibs.libX11
xlibs.libXcomposite xlibs.libXcomposite
xlibs.libXdamage xlibs.libXdamage
@ -113,7 +113,7 @@ stdenv.mkDerivation {
mkdir -p $out/bin mkdir -p $out/bin
rpath="$out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.cc.gcc}/lib64" rpath="$out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.cc.cc}/lib64"
ln -s $out/spotify-client/spotify $out/bin/spotify ln -s $out/spotify-client/spotify $out/bin/spotify

View file

@ -7,7 +7,7 @@ let
atomEnv = buildEnv { atomEnv = buildEnv {
name = "env-atom"; name = "env-atom";
paths = [ paths = [
stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr

View file

@ -56,9 +56,9 @@ let
snappyPath="lib/snappy-java-1.0.5" snappyPath="lib/snappy-java-1.0.5"
7z x -o"$snappyPath" "$snappyPath.jar" 7z x -o"$snappyPath" "$snappyPath.jar"
if [ "${stdenv.system}" == "x86_64-linux" ]; then if [ "${stdenv.system}" == "x86_64-linux" ]; then
patchelf --set-rpath ${stdenv.cc.gcc}/lib64 "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so" patchelf --set-rpath ${stdenv.cc.cc}/lib64 "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so"
else else
patchelf --set-rpath ${stdenv.cc.gcc}/lib "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so" patchelf --set-rpath ${stdenv.cc.cc}/lib "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so"
fi fi
7z a -tzip "$snappyPath.jar" ./"$snappyPath"/* 7z a -tzip "$snappyPath.jar" ./"$snappyPath"/*
rm -vr "$snappyPath" rm -vr "$snappyPath"
@ -74,7 +74,7 @@ let
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \ makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \
--prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
--prefix LD_RUN_PATH : "${stdenv.cc.gcc}/lib/" \ --prefix LD_RUN_PATH : "${stdenv.cc.cc}/lib/" \
--prefix JDK_HOME : "$jdk" \ --prefix JDK_HOME : "$jdk" \
--prefix ${hiName}_JDK : "$jdk" --prefix ${hiName}_JDK : "$jdk"

View file

@ -5,7 +5,7 @@
let let
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXcomposite xlibs.libXi xlibs.libXfixes
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
patchelf \ patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
$out/LightTable/ltbin $out/LightTable/ltbin
ln -s ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 ln -s ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
echo ${libPath} echo ${libPath}
patchelf \ patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
$out/sublime/sublime_text $out/sublime/sublime_text
''; '';

View file

@ -32,7 +32,7 @@ in let
for i in sublime_text plugin_host crash_reporter; do for i in sublime_text plugin_host crash_reporter; do
patchelf \ patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
$i $i
done done
''; '';
@ -41,7 +41,7 @@ in let
mkdir -p $out mkdir -p $out
cp -prvd * $out/ cp -prvd * $out/
# Without this, plugin_host crashes, even though it has the rpath # Without this, plugin_host crashes, even though it has the rpath
wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so
''; '';
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation {
# versions. # versions.
libPath = stdenv.lib.makeLibraryPath libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.gcc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ]; [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ];
meta = { meta = {
description = "Adobe Reader, a viewer for PDF documents"; description = "Adobe Reader, a viewer for PDF documents";

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
glibc glibc
glib glib
stdenv.cc.gcc stdenv.cc.cc
libSM libSM
libICE libICE
libXi libXi

View file

@ -35,7 +35,7 @@ let
''; '';
patchPhase = let patchPhase = let
rpaths = [ stdenv.cc.gcc ]; rpaths = [ stdenv.cc.cc ];
mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}"; mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";
in '' in ''
for sofile in PepperFlash/libpepflashplayer.so \ for sofile in PepperFlash/libpepflashplayer.so \

View file

@ -70,7 +70,7 @@ stdenv.mkDerivation {
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
libPath = stdenv.lib.makeLibraryPath libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.gcc [ stdenv.cc.cc
alsaLib alsaLib
atk atk
cairo cairo
@ -106,7 +106,7 @@ stdenv.mkDerivation {
pulseaudio pulseaudio
systemd systemd
] + ":" + stdenv.lib.makeSearchPath "lib64" [ ] + ":" + stdenv.lib.makeSearchPath "lib64" [
stdenv.cc.gcc stdenv.cc.cc
]; ];
# "strip" after "patchelf" may break binaries. # "strip" after "patchelf" may break binaries.

View file

@ -32,7 +32,7 @@ let
xorg.libXfixes xorg.libXfixes
xorg.libXrender xorg.libXrender
xorg.libXrandr xorg.libXrandr
stdenv.cc.gcc stdenv.cc.cc
alsaLib alsaLib
pulseaudio pulseaudio
dbus_glib dbus_glib
@ -76,11 +76,11 @@ stdenv.mkDerivation rec {
cp opt/google/talkplugin/*.so $plugins cp opt/google/talkplugin/*.so $plugins
for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do
patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.gcc xorg.libX11 ]}:${stdenv.cc.gcc}/lib64" $plugins/$i patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.cc xorg.libX11 ]}:${stdenv.cc.cc}/lib64" $plugins/$i
done done
for i in libgoogletalkremoting.so libnpo1d.so; do for i in libgoogletalkremoting.so libnpo1d.so; do
patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.gcc}/lib64" $plugins/$i patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.cc}/lib64" $plugins/$i
done done
mkdir -p $out/libexec/google/talkplugin mkdir -p $out/libexec/google/talkplugin
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${rpathProgram}:${stdenv.cc.gcc}/lib64" \ --set-rpath "${rpathProgram}:${stdenv.cc.cc}/lib64" \
$out/libexec/google/talkplugin/GoogleTalkPlugin $out/libexec/google/talkplugin/GoogleTalkPlugin
# Generate an LD_PRELOAD wrapper to redirect execvp() calls to # Generate an LD_PRELOAD wrapper to redirect execvp() calls to

View file

@ -6,7 +6,7 @@
, kdeSupport ? false, qt4, kdelibs , kdeSupport ? false, qt4, kdelibs
}: }:
assert stdenv.isLinux && stdenv.cc.gcc != null && stdenv.cc.libc != null; assert stdenv.isLinux && stdenv.cc.cc.isGNU or false && stdenv.cc.libc != null;
let let
mirror = http://get.geo.opera.com/pub/opera; mirror = http://get.geo.opera.com/pub/opera;
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = buildInputs =
[ stdenv.cc.gcc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE
libXft freetype fontconfig libXrender libuuid expat libXft freetype fontconfig libXrender libuuid expat
gstreamer libxml2 gst_plugins_base gstreamer libxml2 gst_plugins_base
] ]

View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
"USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1=" "USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1="
"USE_ILBC=" "USE_OPUS=" "USE_SILK=" "USE_ILBC=" "USE_OPUS=" "USE_SILK="
] ]
++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
; ;
NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm ''; NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm '';

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation {
libPath = libPath =
stdenv.lib.makeLibraryPath [ stdenv.lib.makeLibraryPath [
openssl alsaLib libXext libXfixes libXrandr libjpeg curl_custom openssl alsaLib libXext libXfixes libXrandr libjpeg curl_custom
libX11 libXmu libXv qt4 libXtst mesa stdenv.cc.gcc zlib libX11 libXmu libXv qt4 libXtst mesa stdenv.cc.cc zlib
gnome.GConf libidn rtmpdump c-ares openldap gnome.GConf libidn rtmpdump c-ares openldap
]; ];
buildCommand = '' buildCommand = ''

View file

@ -41,7 +41,7 @@ let
xz xz
libcanberra libcanberra
xcbutilkeysyms xcbutilkeysyms
] + ":${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}"; ] + ":${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}";
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
stdenv.glibc stdenv.glibc
stdenv.cc.gcc stdenv.cc.cc
libXv libXv
libXext libXext
libX11 libX11

View file

@ -67,7 +67,7 @@ stdenv.mkDerivation {
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
libPath = stdenv.lib.makeLibraryPath libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.gcc [ stdenv.cc.cc
gconf gconf
alsaLib alsaLib
at_spi2_atk at_spi2_atk
@ -100,7 +100,7 @@ stdenv.mkDerivation {
nss nss
pango pango
] + ":" + stdenv.lib.makeSearchPath "lib64" [ ] + ":" + stdenv.lib.makeSearchPath "lib64" [
stdenv.cc.gcc stdenv.cc.cc
]; ];
installPhase = installPhase =

View file

@ -5,7 +5,7 @@ let
topath = "${wineUnstable}/bin"; topath = "${wineUnstable}/bin";
toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib")
[ stdenv.cc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "teamviewer-8.0.17147"; name = "teamviewer-8.0.17147";
@ -34,7 +34,7 @@ stdenv.mkDerivation {
EOF EOF
chmod +x $out/bin/teamviewer chmod +x $out/bin/teamviewer
patchelf --set-rpath "${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd
ln -s $out/share/teamviewer8/tv_bin/teamviewerd $out/bin/ ln -s $out/share/teamviewer8/tv_bin/teamviewerd $out/bin/
''; '';

View file

@ -5,7 +5,7 @@ let
topath = "${wineUnstable}/bin"; topath = "${wineUnstable}/bin";
toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib")
[ stdenv.cc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "teamviewer-9.0.32150"; name = "teamviewer-9.0.32150";
@ -34,7 +34,7 @@ stdenv.mkDerivation {
EOF EOF
chmod +x $out/bin/teamviewer chmod +x $out/bin/teamviewer
patchelf --set-rpath "${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd
ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/ ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/
''; '';

View file

@ -6,7 +6,7 @@ let
topath = "${wine}/bin"; topath = "${wine}/bin";
toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib")
[ stdenv.cc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]); [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wine ]);
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "teamviewer-7.0.9377"; name = "teamviewer-7.0.9377";

View file

@ -70,7 +70,7 @@ stdenv.mkDerivation {
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
libPath = stdenv.lib.makeLibraryPath libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.gcc [ stdenv.cc.cc
alsaLib alsaLib
atk atk
cairo cairo
@ -106,7 +106,7 @@ stdenv.mkDerivation {
pulseaudio pulseaudio
systemd systemd
] + ":" + stdenv.lib.makeSearchPath "lib64" [ ] + ":" + stdenv.lib.makeSearchPath "lib64" [
stdenv.cc.gcc stdenv.cc.cc
]; ];
# "strip" after "patchelf" may break binaries. # "strip" after "patchelf" may break binaries.

View file

@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
mkdir -p "$out"/bin mkdir -p "$out"/bin
cat > "$out"/bin/eagle << EOF cat > "$out"/bin/eagle << EOF
#!${stdenv.shell} #!${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" export LD_PRELOAD="$out/lib/eagle_fixer.so"
exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@" exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@"
EOF EOF

View file

@ -5,9 +5,9 @@ assert stdenv.isLinux;
let let
libPath = stdenv.lib.makeLibraryPath 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 freetype fontconfig libxml2 gnome2.gtksourceview
] + ":${stdenv.cc.gcc}/lib64"; ] + ":${stdenv.cc.cc}/lib64";
patchExe = x: '' patchExe = x: ''
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

View file

@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; buildInputs = [openssl qt4 mesa zlib pkgconfig libav];
libPath = stdenv.lib.makeLibraryPath [stdenv.cc.gcc openssl mesa qt4 zlib ] libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl mesa qt4 zlib ]
+ ":" + stdenv.cc.gcc + "/lib64"; + ":" + stdenv.cc.cc + "/lib64";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "convert blu-ray and dvd to mkv"; description = "convert blu-ray and dvd to mkv";

View file

@ -70,7 +70,7 @@ stdenv.mkDerivation {
'' ''
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
} }
patchelf --set-rpath ${stdenv.cc.gcc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i patchelf --set-rpath ${stdenv.cc.cc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i
done done
for i in lib/VBoxOGL*.so for i in lib/VBoxOGL*.so

View file

@ -11,11 +11,11 @@ let
libPath = stdenv.lib.makeLibraryPath libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.libc [ stdenv.cc.libc
stdenv.cc.gcc stdenv.cc.cc
gmp4 gmp4
ncurses ncurses
zlib zlib
] + ":${stdenv.cc.gcc}/lib64"; ] + ":${stdenv.cc.cc}/lib64";
cryptol-bin = cryptol-bin =
if stdenv.system == "i686-linux" if stdenv.system == "i686-linux"

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
gtk2 glib fontconfig freetype unixODBC alsaLib gtk2 glib fontconfig freetype unixODBC alsaLib
]; ];
rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.gcc}/lib64"; rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
unpackPhase = '' unpackPhase = ''
sh $src --keep --noexec sh $src --keep --noexec

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
gtk2 glib fontconfig freetype unixODBC alsaLib gtk2 glib fontconfig freetype unixODBC alsaLib
]; ];
rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.gcc}/lib64"; rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
unpackPhase = '' unpackPhase = ''
sh $src --keep --noexec sh $src --keep --noexec

View file

@ -10,9 +10,8 @@ in
( (
assert a.stdenv ? cc ; assert a.stdenv ? cc ;
assert a.stdenv.cc ? gcc ; assert a.stdenv.cc.cc.isGNU or false ;
assert a.stdenv.cc ? libc ; assert a.stdenv.cc ? libc ;
assert a.stdenv.cc.gcc != null ;
assert a.stdenv.cc.libc != null ; assert a.stdenv.cc.libc != null ;
rec { rec {
@ -37,7 +36,7 @@ rec {
preBuild = a.fullDepEntry ('' preBuild = a.fullDepEntry (''
sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure
sed -re "s@if test -d /proc/self @if false @" -i configure sed -re "s@if test -d /proc/self @if false @" -i configure
sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.cc.gcc}/include -I${a.stdenv.cc.libc}/include ^g' -i makefile sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.cc.cc}/include -I${a.stdenv.cc.libc}/include ^g' -i makefile
'') ["minInit" "doUnpack" "addInputs"]; '') ["minInit" "doUnpack" "addInputs"];
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */

View file

@ -4,7 +4,7 @@
, tcl, tk, xproto, libX11, git, mpfr , tcl, tk, xproto, libX11, git, mpfr
} : } :
let let
realGcc = stdenv.cc.gcc; realGcc = stdenv.cc.cc;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "julia"; pname = "julia";

View file

@ -7,7 +7,7 @@
assert stdenv.isLinux; assert stdenv.isLinux;
let let
realGcc = stdenv.cc.gcc; realGcc = stdenv.cc.cc;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "julia"; pname = "julia";

View file

@ -2,7 +2,7 @@
let let
version = "3.3"; version = "3.3";
gccReal = if (stdenv.cc.gcc or null) == null then stdenv.cc else stdenv.cc.gcc; gccReal = if (stdenv.cc.cc or null) == null then stdenv.cc else stdenv.cc.cc;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -29,7 +29,7 @@ stdenv.mkDerivation {
sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi";
}; };
passthru = { gcc = stdenv.cc.gcc; }; passthru = { cc = stdenv.cc.cc; };
meta = { meta = {
homepage = http://clang.llvm.org/; homepage = http://clang.llvm.org/;

View file

@ -25,7 +25,7 @@ stdenv.mkDerivation {
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
] ++ ] ++
(stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include") ++ (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include") ++
(stdenv.lib.optional (stdenv.cc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.gcc}"); (stdenv.lib.optional (stdenv.cc.cc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.cc}");
# Clang expects to find LLVMgold in its own prefix # Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix # Clang expects to find sanitizer libraries in its own prefix
@ -34,7 +34,7 @@ stdenv.mkDerivation {
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
''; '';
passthru.gcc = stdenv.cc.gcc; passthru.cc = stdenv.cc.cc;
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation {
}; };
libPath = stdenv.lib.makeLibraryPath libPath = stdenv.lib.makeLibraryPath
[stdenv.cc.gcc emacs tk tcl boost gmp]; [stdenv.cc.cc emacs tk tcl boost gmp];
builder = ./builder.sh; builder = ./builder.sh;

View file

@ -174,7 +174,7 @@ let result = stdenv.mkDerivation rec {
*/ */
libraries = libraries =
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++
(if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.gcc] else []); (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.cc] else []);
passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";

View file

@ -54,7 +54,7 @@ in stdenv.mkDerivation {
cp -r bin "$out/bin" cp -r bin "$out/bin"
'' + (if stdenv.isLinux then '' '' + (if stdenv.isLinux then ''
patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
--set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/" \ --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \
"$out/bin/rustc" "$out/bin/rustc"
'' else ""); '' else "");
}; };

View file

@ -67,7 +67,7 @@ stdenv.mkDerivation {
cp -r bin "$out/bin" cp -r bin "$out/bin"
'' + (if stdenv.isLinux then '' '' + (if stdenv.isLinux then ''
patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
--set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/" \ --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \
"$out/bin/rustc" "$out/bin/rustc"
'' else ""); '' else "");
}; };

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, guile, texinfo}: {stdenv, fetchurl, guile, texinfo}:
assert stdenv ? cc && stdenv.cc ? gcc && stdenv.cc.gcc != null; assert stdenv ? cc && stdenv.cc.cc.isGNU or false;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "guile-lib-0.2.2"; name = "guile-lib-0.2.2";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
preCheck = preCheck =
# Make `libgcc_s.so' visible for `pthread_cancel'. # Make `libgcc_s.so' visible for `pthread_cancel'.
'' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.gcc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH" '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.cc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"
''; '';
meta = { meta = {

View file

@ -33,7 +33,7 @@ stdenv.mkDerivation {
sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6"; sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6";
}; };
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc ]; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
dontStrip = true; dontStrip = true;
} }

View file

@ -5,7 +5,7 @@ let
bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64"; bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
libPath = stdenv.lib.makeLibraryPath libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.libc stdenv.cc.gcc ] + ":${stdenv.cc.gcc}/lib64"; [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc}/lib64";
patchLib = x: "patchelf --set-rpath ${libPath} ${x}"; patchLib = x: "patchelf --set-rpath ${libPath} ${x}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

View file

@ -7,7 +7,7 @@
with stdenv.lib; with stdenv.lib;
assert !stdenv.isDarwin -> stdenv.cc ? gcc; assert !stdenv.isDarwin -> stdenv.cc.cc.isGNU or false;
# TODO: # TODO:
# * Add gio-module-fam # * Add gio-module-fam

View file

@ -33,9 +33,9 @@ in
# libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without
# any special hack. # any special hack.
preInstall = '' preInstall = ''
if [ -f ${stdenv.cc.gcc}/lib/libgcc_s.so.1 ]; then if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then
mkdir -p $out/lib mkdir -p $out/lib
cp ${stdenv.cc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
fi fi
''; '';

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
"USE_ZLIB=1" "USE_OPENSSL=1" "USE_ZLIB=1" "USE_OPENSSL=1"
''PREFIX=$(out)'' ''PREFIX=$(out)''
] ]
++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
; ;
meta = { meta = {

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
"LIBRE_INC=${libre}/include/re" "LIBRE_INC=${libre}/include/re"
''PREFIX=$(out)'' ''PREFIX=$(out)''
] ]
++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
; ;
meta = { meta = {

View file

@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
''; '';
postFixup = if stdenv.isDarwin then '' postFixup = if stdenv.isDarwin then ''
install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8 install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8
install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
'' else null; '' else null;
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ unzip ]; buildInputs = [ unzip ];
libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.gcc ]; libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.cc ];
meta = { meta = {
homepage = http://java.sun.com/products/sjwtoolkit/download.html; homepage = http://java.sun.com/products/sjwtoolkit/download.html;

View file

@ -87,7 +87,7 @@ in stdenv.mkDerivation rec {
# Create wrappers # Create wrappers
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo
patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib $out/bin/clinfo patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib $out/bin/clinfo
# Fix modes # Fix modes
find "$out/" -type f -exec chmod 644 {} \; find "$out/" -type f -exec chmod 644 {} \;

View file

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
for i in emulator64-arm emulator64-mips emulator64-x86 for i in emulator64-arm emulator64-mips emulator64-x86
do do
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $i patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $i
patchelf --set-rpath ${stdenv.cc.gcc}/lib64 $i patchelf --set-rpath ${stdenv.cc.cc}/lib64 $i
done done
''} ''}
@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
wrapProgram `pwd`/monitor \ wrapProgram `pwd`/monitor \
--prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.gcc}/lib --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib
cd ../.. cd ../..
'' ''
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
wrapProgram `pwd`/monitor \ wrapProgram `pwd`/monitor \
--prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.gcc}/lib --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib
cd ../.. cd ../..
'' ''

View file

@ -6,7 +6,7 @@ let
atomEnv = buildEnv { atomEnv = buildEnv {
name = "env-atom"; name = "env-atom";
paths = [ paths = [
stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr

View file

@ -37,7 +37,7 @@ stdenv.mkDerivation {
cp -r bin "$out/bin" cp -r bin "$out/bin"
'' + (if stdenv.isLinux then '' '' + (if stdenv.isLinux then ''
patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
--set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/:${zlib}/lib" \ --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \
"$out/bin/cargo" "$out/bin/cargo"
'' else ""); '' else "");
} }

View file

@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
# Patch it # Patch it
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic" 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 # Build the LD_PRELOAD library that makes Logic work from a read-only directory
mkdir -p "$out/lib" mkdir -p "$out/lib"

View file

@ -10,7 +10,7 @@ let
paths = [ paths = [
xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf
freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage
xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc.gcc xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc.cc
xlibs.libXtst xlibs.libXi xlibs.libXtst xlibs.libXi
]; ];
}; };

View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
buildPhase = if stdenv.isDarwin then "" else '' buildPhase = if stdenv.isDarwin then "" else ''
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${openssl}/lib" \ --set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${openssl}/lib" \
bin/phantomjs bin/phantomjs
''; '';

View file

@ -7,7 +7,7 @@ let
inherit (xlibs) libXext libX11; inherit (xlibs) libXext libX11;
lpath = "${stdenv.cc.gcc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [
zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib pulseaudio]; zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib pulseaudio];
in in

View file

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/{opt/andyetitmoves,bin} mkdir -p $out/{opt/andyetitmoves,bin}
cp -r * $out/opt/andyetitmoves/ cp -r * $out/opt/andyetitmoves/
fullPath=${stdenv.cc.gcc}/lib64 fullPath=${stdenv.cc.cc}/lib64
for i in $nativeBuildInputs; do for i in $nativeBuildInputs; do
fullPath=$fullPath''${fullPath:+:}$i/lib fullPath=$fullPath''${fullPath:+:}$i/lib
done done

View file

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
# Store the original hash for dwarf-therapist # Store the original hash for dwarf-therapist
echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.orig echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.orig
# Fix rpath # Fix rpath
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress
cp -f ./${srcs.df_unfuck.name}/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so cp -f ./${srcs.df_unfuck.name}/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so
cp $permission $out/share/df_linux/nix_permission cp $permission $out/share/df_linux/nix_permission

View file

@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
# XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.cc.libc ] libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ]
+ ":" + stdenv.lib.makeLibraryPath [ SDL SDL_image libjpeg62 libpng12 mesa ] + ":" + stdenv.lib.makeLibraryPath [ SDL SDL_image libjpeg62 libpng12 mesa ]
+ ":" + stdenv.lib.makeLibraryPath [ curl3 openal libvorbis libogg ] + ":" + stdenv.lib.makeLibraryPath [ curl3 openal libvorbis libogg ]
+ ":" + stdenv.lib.makeLibraryPath [ libX11 libXext libXft fontconfig zlib ] + ":" + stdenv.lib.makeLibraryPath [ libX11 libXext libXft fontconfig zlib ]
+ ":" + stdenv.cc.gcc + "/lib64"; + ":" + stdenv.cc.cc + "/lib64";
installPhase = '' installPhase = ''
mkdir -p $out/libexec/positech/GSB/ mkdir -p $out/libexec/positech/GSB/

View file

@ -8,7 +8,7 @@ let
name = "megaglest-lib-env"; name = "megaglest-lib-env";
paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype
stdenv.cc.gcc glew mesa_glu mesa_drivers wxGTK ]; stdenv.cc.cc glew mesa_glu mesa_drivers wxGTK ];
}; };
path-env = buildEnv { path-env = buildEnv {
name = "megaglest-path-env"; name = "megaglest-path-env";

View file

@ -25,25 +25,25 @@ stdenv.mkDerivation {
do do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f
done done
patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\
launcher_$arch launcher_$arch
patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\ patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
libNetwork_$arch.so libNetwork_$arch.so
patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\ patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
libQtCoreUnigine_$arch.so.4 libQtCoreUnigine_$arch.so.4
patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\
libQtGuiUnigine_$arch.so.4 libQtGuiUnigine_$arch.so.4
patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\ patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
libQtNetworkUnigine_$arch.so.4 libQtNetworkUnigine_$arch.so.4
patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\
libQtWebKitUnigine_$arch.so.4 libQtWebKitUnigine_$arch.so.4
patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\ patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
libQtXmlUnigine_$arch.so.4 libQtXmlUnigine_$arch.so.4
patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\ patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
libRakNet_$arch.so libRakNet_$arch.so
patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\
libUnigine_$arch.so libUnigine_$arch.so
patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\
OilRush_$arch OilRush_$arch
''; '';
installPhase = '' installPhase = ''

View file

@ -35,12 +35,12 @@ stdenv.mkDerivation {
ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.gcc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin"
wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.gcc}/lib64:${stdenv.glibc}/lib64" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64"
for f in $out/lib/*; do for f in $out/lib/*; do
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.gcc}/lib64:${stdenv.glibc}/lib64" $f patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f
done done
''; '';

View file

@ -7,7 +7,7 @@ stdenv.mkDerivation {
inherit game paks mesa name; inherit game paks mesa name;
gcc = stdenv.cc.gcc; gcc = stdenv.cc.cc;
meta = { meta = {
inherit description; inherit description;

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.cc.gcc}/lib" \ --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.cc.cc}/lib" \
share/sdlmame/sdlmame share/sdlmame/sdlmame
mkdir -p "$out/bin" mkdir -p "$out/bin"

View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram "$out/bin/spring" \ wrapProgram "$out/bin/spring" \
--prefix LD_LIBRARY_PATH : "${stdenv.cc.gcc}/lib::${systemd}/lib" --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc}/lib::${systemd}/lib"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -25,7 +25,7 @@ stdenv.mkDerivation {
cp -r * $out/res cp -r * $out/res
patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \ patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \
--set-rpath ${stdenv.cc.gcc}/lib:${libX11}/lib:${mesa}/lib \ --set-rpath ${stdenv.cc.cc}/lib:${libX11}/lib:${mesa}/lib \
"$out/res/Tibia" "$out/res/Tibia"
# We've patchelf'd the files. The main Tibia binary is a bit # We've patchelf'd the files. The main Tibia binary is a bit

View file

@ -12,7 +12,7 @@ let
rtdeps = stdenv.lib.makeLibraryPath rtdeps = stdenv.lib.makeLibraryPath
[ xlibs.libXxf86vm xlibs.libXext openal ] [ xlibs.libXxf86vm xlibs.libXext openal ]
+ ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.gcc ]; + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ];
buildCommand = buildCommand =
'' ''

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# The fpc is not properly wrapped to add -rpath. I add this manually. # The fpc is not properly wrapped to add -rpath. I add this manually.
# I even do a trick on lib/lib64 for libgcc, that I expect it will work. # I even do a trick on lib/lib64 for libgcc, that I expect it will work.
preBuild = '' preBuild = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.gcc}/lib64 -rpath ${stdenv.cc.gcc}/lib" export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc}/lib64 -rpath ${stdenv.cc.cc}/lib"
sed -i 414,424d Makefile sed -i 414,424d Makefile
''; '';

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
phases = "installPhase"; phases = "installPhase";
ld_preload = ./isatty.c; ld_preload = ./isatty.c;
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.cc.libc ] libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ]
+ ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ; + ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ;
installPhase = '' installPhase = ''

View file

@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
# XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.cc.libc ] libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ]
+ ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis mesa ] + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis mesa ]
+ ":" + stdenv.cc.gcc + "/lib64"; + ":" + stdenv.cc.cc + "/lib64";
installPhase = '' installPhase = ''
mkdir -p $out/libexec/2dboy/WorldOfGoo/ mkdir -p $out/libexec/2dboy/WorldOfGoo/

View file

@ -38,7 +38,7 @@ stdenv.mkDerivation {
phases = "buildPhase"; phases = "buildPhase";
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc zlib ]; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib ];
buildPhase = '' buildPhase = ''
ar -x $src data.tar.gz ar -x $src data.tar.gz

View file

@ -4,7 +4,7 @@
}: }:
assert stdenv.isLinux; assert stdenv.isLinux;
assert stdenv.cc.gcc != null; assert stdenv.cc.cc.isGNU or false;
let let
version = "1.6.2"; version = "1.6.2";
@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
# them to the RPATH so that the user doesn't have to set them in # them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH. # LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
freetype fontconfig stdenv.cc.gcc mesa mesa_noglu.osmesa libdrm freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite libpng libjpeg xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
openssl gnutls cups openssl gnutls cups
@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
paxmark psmr $out/bin/wine{,-preloader} paxmark psmr $out/bin/wine{,-preloader}
wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -4,7 +4,7 @@
}: }:
assert stdenv.isLinux; assert stdenv.isLinux;
assert stdenv.cc.gcc != null; assert stdenv.cc.cc.isGNU or false;
let let
version = "1.7.34"; version = "1.7.34";
@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
# them to the RPATH so that the user doesn't have to set them in # them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH. # LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
freetype fontconfig stdenv.cc.gcc mesa mesa_noglu.osmesa libdrm freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite libpng libjpeg xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
openssl gnutls cups ncurses openssl gnutls cups ncurses
@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
install -D ${gecko} $out/share/wine/gecko/${gecko64.name} install -D ${gecko} $out/share/wine/gecko/${gecko64.name}
'' + '' '' + ''
install -D ${mono} $out/share/wine/mono/${mono.name} install -D ${mono} $out/share/wine/mono/${mono.name}
wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -36,7 +36,7 @@ stdenv.mkDerivation {
builder = ./builder.sh; builder = ./builder.sh;
inherit libXxf86vm xf86vidmodeproto; inherit libXxf86vm xf86vidmodeproto;
gcc = stdenv.cc.gcc; gcc = stdenv.cc.cc;
src = fetchurl { src = fetchurl {
url = http://www2.ati.com/drivers/linux/amd-catalyst-omega-14.12-linux-run-installers.zip; url = http://www2.ati.com/drivers/linux/amd-catalyst-omega-14.12-linux-run-installers.zip;

View file

@ -42,9 +42,9 @@ stdenv.mkDerivation {
dontStrip = true; dontStrip = true;
glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
cudaPath = makeLibraryPath [zlib stdenv.cc.gcc]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc];
openclPath = makeLibraryPath [zlib]; openclPath = makeLibraryPath [zlib];
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.gcc]; allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc];
programPath = optionalString (!libsOnly) (makeLibraryPath programPath = optionalString (!libsOnly) (makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );

View file

@ -32,7 +32,7 @@ stdenv.mkDerivation {
glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.gcc]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc];
programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ]; programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ];

View file

@ -36,7 +36,7 @@ stdenv.mkDerivation {
glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.gcc]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc];
programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );

View file

@ -45,9 +45,9 @@ stdenv.mkDerivation {
dontStrip = true; dontStrip = true;
glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
cudaPath = makeLibraryPath [zlib stdenv.cc.gcc]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc];
openclPath = makeLibraryPath [zlib]; openclPath = makeLibraryPath [zlib];
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.gcc]; allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc];
programPath = optionalString (!libsOnly) (makeLibraryPath programPath = optionalString (!libsOnly) (makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );

View file

@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
cd linux${arch} cd linux${arch}
''; '';
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc libXrender fontconfig freetype libXext libX11 ]; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libXrender fontconfig freetype libXext libX11 ];
installPhase = '' installPhase = ''
install -Dm755 OCZToolbox $out/bin/OCZToolbox install -Dm755 OCZToolbox $out/bin/OCZToolbox

View file

@ -11,6 +11,6 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xorg-sys-opengl-3"; name = "xorg-sys-opengl-3";
builder = ./builder.sh; builder = ./builder.sh;
neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm stdenv.cc.gcc]; neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm stdenv.cc.cc];
} }

View file

@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
''; '';
libPath = with xorg; libPath = with xorg;
stdenv.lib.makeLibraryPath ([ stdenv.cc.gcc libXrandr libXext libX11 libXcomposite libXinerama ] stdenv.lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ]
++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]); ++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]);
desktops = map (x: substituteAll ({ desktops = map (x: substituteAll ({

View file

@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
# This is needed because systemd uses the gold linker, which doesn't # This is needed because systemd uses the gold linker, which doesn't
# yet have the wrapper script to add rpath flags automatically. # yet have the wrapper script to add rpath flags automatically.
NIX_LDFLAGS = "-rpath ${pam}/lib -rpath ${libcap}/lib -rpath ${acl}/lib -rpath ${stdenv.cc.gcc}/lib"; NIX_LDFLAGS = "-rpath ${pam}/lib -rpath ${libcap}/lib -rpath ${acl}/lib -rpath ${stdenv.cc.cc}/lib";
PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
install -D influxdb $out/bin/influxdb install -D influxdb $out/bin/influxdb
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/influxdb patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/influxdb
wrapProgram "$out/bin/influxdb" \ wrapProgram "$out/bin/influxdb" \
--prefix LD_LIBRARY_PATH : "${stdenv.cc.gcc}/lib:${stdenv.cc.gcc}/lib64:${zlib}/lib:${bzip2}/lib" --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc}/lib:${stdenv.cc.cc}/lib64:${zlib}/lib:${bzip2}/lib"
mkdir -p $out/share/influxdb mkdir -p $out/share/influxdb
cp -R admin scripts config.toml $out/share/influxdb cp -R admin scripts config.toml $out/share/influxdb

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
''PREFIX=$(out)'' ''PREFIX=$(out)''
"USE_MYSQL=1" "USE_MYSQL=1"
] ]
++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
; ;
NIX_LDFLAGS='' -L${mysql}/lib/mysql ''; NIX_LDFLAGS='' -L${mysql}/lib/mysql '';

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation {
# for the builder script # for the builder script
inherit xauth fontDirectories perl; inherit xauth fontDirectories perl;
gcc = stdenv.cc.gcc; gcc = stdenv.cc.cc;
buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth]; buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth];
builder = ./builder.sh; builder = ./builder.sh;

View file

@ -5,12 +5,12 @@ assert stdenv.isLinux;
let let
p = if stdenv.is64bit then { p = if stdenv.is64bit then {
arch = "x86_64"; arch = "x86_64";
gcclib = "${stdenv.cc.gcc}/lib64"; gcclib = "${stdenv.cc.cc}/lib64";
sha256 = "09kw7f0qsvx3vx1c1zb117yf3yk7kkz66agspz5xx9b0zh6i82jw"; sha256 = "09kw7f0qsvx3vx1c1zb117yf3yk7kkz66agspz5xx9b0zh6i82jw";
} }
else { else {
arch = "i386"; arch = "i386";
gcclib = "${stdenv.cc.gcc}/lib"; gcclib = "${stdenv.cc.cc}/lib";
sha256 = "0f2230c91120f05159281b39c620ab6bad6559ce8a17a0874d0a82350ebba426"; sha256 = "0f2230c91120f05159281b39c620ab6bad6559ce8a17a0874d0a82350ebba426";
}; };
in in

View file

@ -31,7 +31,7 @@ rec {
needLib64 = a.stdenv.system == "x86_64-linux"; needLib64 = a.stdenv.system == "x86_64-linux";
postInstall = a.fullDepEntry('' postInstall = a.fullDepEntry(''
patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.cc.gcc != null then ":${a.stdenv.cc.gcc}/lib" else ""}${if a.stdenv.cc.gcc != null && needLib64 then ":${a.stdenv.cc.gcc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.cc.cc != null then ":${a.stdenv.cc.cc}/lib" else ""}${if a.stdenv.cc.cc != null && needLib64 then ":${a.stdenv.cc.cc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform
'') ["minInit" "addInputs" "doMakeInstall"]; '') ["minInit" "addInputs" "doMakeInstall"];
name = "cuneiform-" + version; name = "cuneiform-" + version;

View file

@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
buildInputs = [rpmextract ncurses unzip makeWrapper]; buildInputs = [rpmextract ncurses unzip makeWrapper];
libPath = libPath =
stdenv.lib.makeLibraryPath stdenv.lib.makeLibraryPath
[ stdenv.cc.gcc stdenv.cc.libc ncurses ]; [ stdenv.cc.cc stdenv.cc.libc ncurses ];
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
cd $out cd $out
unzip ${src} unzip ${src}
rpmextract linux/MegaCli-8.07.07-1.noarch.rpm rpmextract linux/MegaCli-8.07.07-1.noarch.rpm
${patchelf}/bin/patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64 ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib opt/MegaRAID/MegaCli/MegaCli64
wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64 wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64
ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64
eval fixupPhase eval fixupPhase

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }: { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }:
assert stdenv.isLinux; assert stdenv.isLinux;
assert stdenv.cc.gcc != null; assert stdenv.cc.cc.isGNU or false;
let let
version = "0.7"; version = "0.7";
debianPatch = fetchurl { debianPatch = fetchurl {
@ -18,7 +18,7 @@ stdenv.mkDerivation {
buildInputs = [ readline tcp_wrappers pcre makeWrapper ]; buildInputs = [ readline tcp_wrappers pcre makeWrapper ];
patches = [ debianPatch ]; patches = [ debianPatch ];
postInstall = '' postInstall = ''
wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""} wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}
''; '';
meta = { meta = {
description = "Advanced tftp tools"; description = "Advanced tftp tools";

View file

@ -9,7 +9,7 @@ let
torEnv = buildEnv { torEnv = buildEnv {
name = "tor-env"; name = "tor-env";
paths = [ paths = [
stdenv.cc.gcc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
fontconfig gdk_pixbuf cairo xlibs.libXrender xlibs.libX11 xlibs.libXext fontconfig gdk_pixbuf cairo xlibs.libXrender xlibs.libX11 xlibs.libXext
xlibs.libXt xlibs.libXt
]; ];