From 4250b2a66172ae5b6a0e47ec32cd602481a25404 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 25 Mar 2023 18:40:04 +0200 Subject: [PATCH] signalbackup-tools: fix x86_64-darwin build llvmPackages_14.stdenv != darwin.apple_sdk_11_0.clang14Stdenv --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 81a66a93e3f..81ba3859f28 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, llvmPackages_14, fetchFromGitHub, openssl, sqlite }: +{ lib, stdenv, darwin, fetchFromGitHub, openssl, sqlite }: -(if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv).mkDerivation rec { +(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; version = "20230316"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78ab9e31f0d..91cafd42944 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12077,7 +12077,7 @@ with pkgs; sigil = libsForQt5.callPackage ../applications/editors/sigil { }; - signalbackup-tools = darwin.apple_sdk_11_0.callPackage ../applications/networking/instant-messengers/signalbackup-tools { }; + signalbackup-tools = callPackage ../applications/networking/instant-messengers/signalbackup-tools { }; signald = callPackage ../applications/networking/instant-messengers/signald { };