From e56980b08cd447739b34d411c08a0fa90af9ae82 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Mon, 17 Oct 2022 21:38:11 -0700
Subject: [PATCH] ccache: 4.6.3 -> 4.7

---
 pkgs/development/tools/misc/ccache/default.nix   |  4 ++--
 .../misc/ccache/force-objdump-on-darwin.patch    | 16 ++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 9d28d2f1e246..502718831527 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -15,13 +15,13 @@
 
 let ccache = stdenv.mkDerivation rec {
   pname = "ccache";
-  version = "4.6.3";
+  version = "4.7";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-uMGM3YW85wgJFin9IGrKafOkSLmN5/q/LP1sttN7/u0=";
+    sha256 = "sha256-Aqk8ukynXHXHieaI/5K5Wfh5ghpe1yfNtZHeXs7kn1I=";
   };
 
   outputs = [ "out" "man" ];
diff --git a/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch b/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch
index 81a4f27ab736..4b4d79867f39 100644
--- a/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch
+++ b/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch
@@ -1,8 +1,6 @@
-diff --git a/test/run b/test/run
-index 9623e49d..3df1c5a8 100755
 --- a/test/run
 +++ b/test/run
-@@ -126,23 +126,17 @@ file_size() {
+@@ -148,21 +148,17 @@ file_size() {
  objdump_cmd() {
      local file="$1"
  
@@ -22,10 +20,8 @@ index 9623e49d..3df1c5a8 100755
  objdump_grep_cmd() {
 -    if $HOST_OS_APPLE; then
 -        fgrep -q "\"$1\""
--    else
--        fgrep -q ": $1"
--    fi
-+    fgrep -q ": $1"
- }
- 
- expect_stat() {
+-    elif $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then
++    if $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then
+         fgrep -q "$1"
+     else
+         fgrep -q ": $1"