diff options
| author | Shea Levy <shea@shealevy.com> | 2014-12-26 12:28:15 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-12-26 12:28:15 -0500 |
| commit | 05edd656f6bdecde31eb0270209cfc7e2320caad (patch) | |
| tree | 4b7c9eaf4d76874b7114015038ceb7d3e23b64bc /pkgs/os-specific | |
| parent | 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c (diff) | |
| download | nixpkgs-05edd656f6bdecde31eb0270209cfc7e2320caad.tar nixpkgs-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.gz nixpkgs-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.bz2 nixpkgs-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.lz nixpkgs-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.xz nixpkgs-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.zst nixpkgs-05edd656f6bdecde31eb0270209cfc7e2320caad.zip | |
Missed gcc refs
Diffstat (limited to 'pkgs/os-specific')
| -rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/ocz-toolbox/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/prl-tools/default.nix | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 4291116f4ef..5d6647d1ee0 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -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 diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index e1a82da91f4..0d27c89eac2 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -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 ] ); diff --git a/pkgs/os-specific/linux/ocz-toolbox/default.nix b/pkgs/os-specific/linux/ocz-toolbox/default.nix index b41fc34be3e..65d4fa0f07a 100644 --- a/pkgs/os-specific/linux/ocz-toolbox/default.nix +++ b/pkgs/os-specific/linux/ocz-toolbox/default.nix @@ -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 ''; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 90921b5a61d..f76d409fcfb 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -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 ({ |