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

Missed gcc refs

Browse Source
This commit is contained in:
Shea Levy
2014-12-26 12:28:15 -05:00
parent 28b6fb61e6
commit 05edd656f6
20 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@@ -51,7 +51,7 @@ installPhase() {
for i in nvidia-settings nvidia-smi; do
cp $i $out/bin/$i
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i
done

4
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

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

4
pkgs/os-specific/linux/ocz-toolbox/default.nix
View File

@@ -16,12 +16,12 @@ in stdenv.mkDerivation rec {
cd linux${arch}
'';
libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc libXrender fontconfig freetype libXext libX11 ];
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc libXrender fontconfig freetype libXext libX11 ];
installPhase = ''
install -Dm755 OCZToolbox $out/bin/OCZToolbox
patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$libPath" \
$out/bin/OCZToolbox
'';

2
pkgs/os-specific/linux/prl-tools/default.nix
View File

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