From 2dfea1c1b7813ba547a4818f0dc08e7f6005b064 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Oct 2023 17:15:37 +0000 Subject: [PATCH 1/2] libre: 2.9.0 -> 3.6.0 --- pkgs/development/libraries/libre/default.nix | 23 +++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index bfcdb2d5287c..9a86643061ce 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,16 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, zlib, openssl -, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, zlib +, openssl +, cmake +, SystemConfiguration +}: stdenv.mkDerivation rec { - version = "2.9.0"; + version = "3.6.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-YNAfHmohMqGGF8N/VdndJJ32PF/GMBoNtjo/t2lt6HA="; + sha256 = "sha256-pFtrmrNRSL1lw10LjayOoNFrW/tTPXwmUipwC5v1MZs="; }; - buildInputs = [ zlib openssl ]; + + buildInputs = [ + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + SystemConfiguration + ]; + nativeBuildInputs = [ cmake ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0150c6bca6d..a0f9d8f932db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23084,7 +23084,9 @@ with pkgs; inherit (lomiri) cmake-extras; }; - libre = callPackage ../development/libraries/libre { }; + libre = callPackage ../development/libraries/libre { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; librecast = callPackage ../development/libraries/librecast { }; From 3b6f331a2faa64752242d6d2178b6a60c81df429 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 30 Oct 2023 22:17:10 +0000 Subject: [PATCH 2/2] baresip: 2.9.0 -> 3.6.0 --- .../networking/instant-messengers/baresip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 5aa3629bd38e..fd9bdf89234d 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -27,13 +27,13 @@ , dbusSupport ? true }: stdenv.mkDerivation rec { - version = "2.9.0"; + version = "3.6.0"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - sha256 = "sha256-B4d8D4IfLYAIYVN80Lrh5bywD5iacSnUVwEzbc6Xq7g="; + hash = "sha256-cp9aaOtvFl9RUHPQRMkSjPvf0fJ29Bclh4SKnAHo7fE="; }; prePatch = lib.optionalString (!dbusSupport) '' substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""