diff options
| author | R. Ryantm <ryantm-bot@ryantm.com> | 2023-10-30 17:15:37 +0000 |
|---|---|---|
| committer | Robert Scott <code@humanleg.org.uk> | 2023-10-30 22:39:14 +0000 |
| commit | 2dfea1c1b7813ba547a4818f0dc08e7f6005b064 (patch) | |
| tree | e2966df9d6f3674b58d002a9899c2d061e2d54a0 | |
| parent | 3e93e2445ab48d167d27cf0d45f684cb0a389810 (diff) | |
| download | nixpkgs-2dfea1c1b7813ba547a4818f0dc08e7f6005b064.tar nixpkgs-2dfea1c1b7813ba547a4818f0dc08e7f6005b064.tar.gz nixpkgs-2dfea1c1b7813ba547a4818f0dc08e7f6005b064.tar.bz2 nixpkgs-2dfea1c1b7813ba547a4818f0dc08e7f6005b064.tar.lz nixpkgs-2dfea1c1b7813ba547a4818f0dc08e7f6005b064.tar.xz nixpkgs-2dfea1c1b7813ba547a4818f0dc08e7f6005b064.tar.zst nixpkgs-2dfea1c1b7813ba547a4818f0dc08e7f6005b064.zip | |
libre: 2.9.0 -> 3.6.0
| -rw-r--r-- | pkgs/development/libraries/libre/default.nix | 23 | ||||
| -rw-r--r-- | 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 bfcdb2d5287..9a86643061c 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 b0150c6bca6..a0f9d8f932d 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 { }; |