Loading pkgs/development/tools/misc/ccache/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -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" ]; Loading pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch +6 −10 Original line number Diff line number Diff line 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" Loading @@ -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" Loading
pkgs/development/tools/misc/ccache/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -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" ]; Loading
pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch +6 −10 Original line number Diff line number Diff line 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" Loading @@ -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"