From c6b663c00ea7873e56228b0fcac818e87faa4b60 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 4 Nov 2024 12:38:14 -0800 Subject: [PATCH 1/2] signalbackup-tools: 20241025 -> 20241105-2 Diff: https://github.com/bepaald/signalbackup-tools/compare/20241025...20241104-1 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 9c28a80aa497..5eeab919a4a3 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20241025"; + version = "20241105-2"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-ivk7sqTP5kLXrTn+XDrat0VxiK0atA5xI3TzKXvxaV0="; + hash = "sha256-ucyNJTn/wt4X4ptDrMu/XbeQrbeMKms8c0oXqH280H0="; }; nativeBuildInputs = [ From 0a8d9266d69a2e21c1abb614eaa2acdf3718a097 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 4 Nov 2024 12:49:23 -0800 Subject: [PATCH 2/2] signalbackup-tools: update to new darwin SDK pattern --- .../si/signalbackup-tools/package.nix} | 7 +++++-- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/{applications/networking/instant-messengers/signalbackup-tools/default.nix => by-name/si/signalbackup-tools/package.nix} (88%) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/by-name/si/signalbackup-tools/package.nix similarity index 88% rename from pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix rename to pkgs/by-name/si/signalbackup-tools/package.nix index 5eeab919a4a3..a8fe62996d32 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -6,7 +6,8 @@ cmake, pkg-config, - darwin, + apple-sdk_11, + darwinMinVersionHook, dbus, openssl, sqlite, @@ -35,7 +36,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security + # Needed for `utimensat` on `x86_64-darwin` + apple-sdk_11 + (darwinMinVersionHook "11.3") ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee5cf9af5d83..fdca75f21de7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12077,9 +12077,6 @@ with pkgs; sigil = libsForQt5.callPackage ../applications/editors/sigil { }; - signalbackup-tools = darwin.apple_sdk_11_0.callPackage - ../applications/networking/instant-messengers/signalbackup-tools { }; - signald = callPackage ../applications/networking/instant-messengers/signald { }; signaldctl = callPackage ../applications/networking/instant-messengers/signaldctl { };