Merge remote-tracking branch 'origin/master' into staging

2 files changed, 25 insertions, 21 deletions

diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix
index 0fd9f143ce9a..359ab125be99 100644
--- a/pkgs/development/tools/misc/bsdbuild/default.nix
+++ b/pkgs/development/tools/misc/bsdbuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, groff, ed }:
+{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }:
 
 stdenv.mkDerivation rec {
   name = "bsdbuild-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl";
   };
 
-  buildInputs = [ perl groff ed ];
+  buildInputs = [ perl mandoc ed ];
   nativeBuildInputs = [ pkgconfig libtool gettext ];
 
   prePatch = ''
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index f538c2138926..c90e356e044f 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }:
+{ stdenv, fetchurl, fetchpatch, runCommand, zlib }:
 
 let ccache = stdenv.mkDerivation rec {
   name = "ccache-${version}";
@@ -15,43 +15,47 @@ let ccache = stdenv.mkDerivation rec {
     substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)'
   '';
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
 
-  passthru = {
+  passthru = let
+      cc = stdenv.cc.cc;
+      ccname = if stdenv.cc.isClang then "clang" else "gcc";
+      cxxname = if stdenv.cc.isClang then "clang++" else "g++";
+    in {
     # A derivation that provides gcc and g++ commands, but that
     # will end up calling ccache for the given cacheDir
     links = extraConfig: stdenv.mkDerivation rec {
       name = "ccache-links";
       passthru = {
-        inherit gcc;
-        isGNU = true;
+        inherit (stdenv.cc) isClang;
+        inherit (cc) isGNU;
       };
-      inherit (gcc.cc) lib;
+      inherit (cc) lib;
       buildCommand = ''
         mkdir -p $out/bin
-        if [ -x "${gcc.cc}/bin/gcc" ]; then
-          cat > $out/bin/gcc << EOF
+        if [ -x "${cc}/bin/${ccname}" ]; then
+          cat > $out/bin/${ccname} << EOF
           #!/bin/sh
           ${extraConfig}
-          exec ${ccache}/bin/ccache ${gcc.cc}/bin/gcc "\$@"
+          exec ${ccache}/bin/ccache ${cc}/bin/${ccname} "\$@"
         EOF
-          chmod +x $out/bin/gcc
+          chmod +x $out/bin/${ccname}
         fi
-        if [ -x "${gcc.cc}/bin/g++" ]; then
-          cat > $out/bin/g++ << EOF
+        if [ -x "${cc}/bin/${cxxname}" ]; then
+          cat > $out/bin/${cxxname} << EOF
           #!/bin/sh
           ${extraConfig}
-          exec ${ccache}/bin/ccache ${gcc.cc}/bin/g++ "\$@"
+          exec ${ccache}/bin/ccache ${cc}/bin/${cxxname} "\$@"
         EOF
-          chmod +x $out/bin/g++
+          chmod +x $out/bin/${cxxname}
         fi
-        for executable in $(ls ${gcc.cc}/bin); do
+        for executable in $(ls ${cc}/bin); do
           if [ ! -x "$out/bin/$executable" ]; then
-            ln -s ${gcc.cc}/bin/$executable $out/bin/$executable
+            ln -s ${cc}/bin/$executable $out/bin/$executable
           fi
         done
-        for file in $(ls ${gcc.cc} | grep -vw bin); do
-          ln -s ${gcc.cc}/$file $out/$file
+        for file in $(ls ${cc} | grep -vw bin); do
+          ln -s ${cc}/$file $out/$file
         done
       '';
     };
@@ -63,7 +67,7 @@ let ccache = stdenv.mkDerivation rec {
     downloadPage = https://ccache.samba.org/download.html;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ nckx ];
-    platforms = with platforms; linux;
+    platforms = platforms.unix;
   };
 };
 in ccache