colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #205469 from r-ryantm/auto-update/libre

Browse Source 
libre: 2.9.0 -> 3.6.0
This commit is contained in:
7c6f434c 2023-11-02 17:32:17 +00:00 committed by GitHub
commit f02a75fffe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/baresip/default.nix
View File

@ -27,13 +27,13 @@
, dbusSupport ? true , dbusSupport ? true
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.9.0"; version = "3.6.0";
pname = "baresip"; pname = "baresip";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baresip"; owner = "baresip";
repo = "baresip"; repo = "baresip";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-B4d8D4IfLYAIYVN80Lrh5bywD5iacSnUVwEzbc6Xq7g="; hash = "sha256-cp9aaOtvFl9RUHPQRMkSjPvf0fJ29Bclh4SKnAHo7fE=";
}; };
prePatch = lib.optionalString (!dbusSupport) '' prePatch = lib.optionalString (!dbusSupport) ''
substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' "" substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""

23
pkgs/development/libraries/libre/default.nix
View File

@ -1,16 +1,29 @@
{ lib, stdenv, fetchFromGitHub, zlib, openssl { lib
, cmake }: , stdenv
, fetchFromGitHub
, zlib
, openssl
, cmake
, SystemConfiguration
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.9.0"; version = "3.6.0";
pname = "libre"; pname = "libre";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baresip"; owner = "baresip";
repo = "re"; repo = "re";
rev = "v${version}"; 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 ]; nativeBuildInputs = [ cmake ];
makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"

4
pkgs/top-level/all-packages.nix
View File

@ -23086,7 +23086,9 @@ with pkgs;
inherit (lomiri) cmake-extras; 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 { }; librecast = callPackage ../development/libraries/librecast { };