From aea1254f96b068d370cb0dbc16638e7cef8ba84c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 2 Feb 2015 21:30:05 -0500
Subject: [PATCH] cc-wrapper merge fixes

---
 pkgs/applications/audio/spotify/default.nix        |  1 -
 .../setup-hook-stdinc.sh                           |  0
 pkgs/top-level/all-packages.nix                    | 14 +++++++-------
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/build-support/{gcc-wrapper => cc-wrapper}/setup-hook-stdinc.sh (100%)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index ef093659cfb3..b7531b2d43fe 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -28,7 +28,6 @@ let
     nss
     pango
     qt4
-    sqlite
     stdenv.cc.cc
     xlibs.libX11
     xlibs.libXcomposite
diff --git a/pkgs/build-support/gcc-wrapper/setup-hook-stdinc.sh b/pkgs/build-support/cc-wrapper/setup-hook-stdinc.sh
similarity index 100%
rename from pkgs/build-support/gcc-wrapper/setup-hook-stdinc.sh
rename to pkgs/build-support/cc-wrapper/setup-hook-stdinc.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45afd8bc2f9b..d9a388f7425e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4135,17 +4135,17 @@ let
    * build system so that the Qt 4 components find the Qt 4 headers and the Qt 5
    * components find the Qt 5 headers.
    */
-  wrapGCCStdInc = glibc: baseGCC: (import ../build-support/gcc-wrapper) {
+  wrapGCCStdInc = glibc: baseGCC: (import ../build-support/cc-wrapper) {
     nativeTools = stdenv.cc.nativeTools or false;
     nativeLibc = stdenv.cc.nativeLibc or false;
     nativePrefix = stdenv.cc.nativePrefix or "";
-    gcc = baseGCC;
+    cc = baseGCC;
     libc = glibc;
     inherit stdenv binutils coreutils zlib;
-    setupHook = ../build-support/gcc-wrapper/setup-hook-stdinc.sh;
+    setupHook = ../build-support/cc-wrapper/setup-hook-stdinc.sh;
   };
 
-  gccStdInc = wrapGCCStdInc glibc gcc.gcc;
+  gccStdInc = wrapGCCStdInc glibc gcc.cc;
 
   # prolog
   yap = callPackage ../development/compilers/yap { };
@@ -5853,7 +5853,7 @@ let
   };
 
   kf55 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.5 {
-    stdenv = overrideGCC stdenv gccStdInc;
+    stdenv = overrideCC stdenv gccStdInc;
   });
   kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 {});
   kf5_latest = kf56;
@@ -10444,7 +10444,7 @@ let
 
   kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
     kf5 = kf55;
-    stdenv = overrideGCC stdenv gccStdInc;
+    stdenv = overrideCC stdenv gccStdInc;
   });
   kdeApps_latest = kdeApps_14_12;
   kdeApps_stable = kdeApps_14_12;
@@ -12549,7 +12549,7 @@ let
   mate-themes = callPackage ../misc/themes/mate-themes { };
 
   plasma51 = recurseIntoAttrs (callPackage ../desktops/plasma-5.1 {
-    stdenv = overrideGCC stdenv gccStdInc;
+    stdenv = overrideCC stdenv gccStdInc;
   });
   plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {});
   plasma5_latest = plasma52;