diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2023-11-02 17:32:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-02 17:32:17 +0000 |
| commit | f02a75fffed0392a97075062d65a84cd91ccccbd (patch) | |
| tree | a3bda840d4c821710d04cfa51f14a172e91b48fe | |
| parent | 9a49f0cb28d1ff19732136683e81902d78c5bc7b (diff) | |
| parent | 3b6f331a2faa64752242d6d2178b6a60c81df429 (diff) | |
Merge pull request #205469 from r-ryantm/auto-update/libre
libre: 2.9.0 -> 3.6.0
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/baresip/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libre/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 23 insertions, 8 deletions
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 5aa3629bd38e0..fd9bdf89234d5 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)' "" diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index bfcdb2d5287cb..9a86643061ced 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 2251a98c4e883..758ea117d4ae8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23086,7 +23086,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 { }; |