From e4106d474541d6ab3304f4f8ff03185c769bbe1f Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Sun, 10 Jul 2022 09:24:18 +0100 Subject: [PATCH] signalbackup-tools: use Apple SDK 11 for all darwin systems --- .../apple-sdk-missing-utimensat.patch | 34 ------------------- .../signalbackup-tools/default.nix | 3 -- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch b/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch deleted file mode 100644 index 61474d0ab4fc..000000000000 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/signalbackup/setfiletimestamp.cc b/signalbackup/setfiletimestamp.cc -index f53a168..d2d1c5e 100644 ---- a/signalbackup/setfiletimestamp.cc -+++ b/signalbackup/setfiletimestamp.cc -@@ -21,24 +21,23 @@ - - #if !defined(_WIN32) && !defined(__MINGW64__) - --#include --#include -+#include - - bool SignalBackup::setFileTimeStamp(std::string const &file, long long int time_usec) const - { -- struct timespec ntimes[] = -+ struct timeval ntimes[] = - { - { // ntimes[0] = - time_usec / 1000, // tv_sec, seconds -- (time_usec % 1000) * 1000 // tv_usec, nanoseconds -+ static_cast(time_usec) // tv_usec, nanoseconds - }, - { // ntimes[1] = - time_usec / 1000, // tv_sec, seconds -- (time_usec % 1000) * 1000 // tv_usec, nanoseconds -+ static_cast(time_usec) // tv_usec, nanoseconds - } - }; - -- return (utimensat(AT_FDCWD, file.c_str(), ntimes, 0) == 0); -+ return (utimes(file.c_str(), ntimes) == 0); - } - - #else // this is poorly tested, I don't have windows diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index adbe34207c02..a78dbe3bc371 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -11,9 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-vFq9NvQboqGVzwiH2KPhT6jsdY5i2oKIgEaZKfBsb/o="; }; - # Remove when Apple SDK is >= 10.13 - patches = lib.optional (stdenv.system == "x86_64-darwin") ./apple-sdk-missing-utimensat.patch; - buildInputs = [ openssl sqlite ]; buildFlags = [ "-Wall" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c384a14b817..d2576a5cf427 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10505,7 +10505,7 @@ with pkgs; sigil = libsForQt5.callPackage ../applications/editors/sigil { }; - signalbackup-tools = callPackage ../applications/networking/instant-messengers/signalbackup-tools { }; + signalbackup-tools = darwin.apple_sdk_11_0.callPackage ../applications/networking/instant-messengers/signalbackup-tools { }; signald = callPackage ../applications/networking/instant-messengers/signald { };