From 5a65a419627fa1746fac2d8b1a7219a47908e781 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sun, 26 Feb 2023 14:54:26 -0800
Subject: [PATCH 1/2] libre: use cmake for configurePhase

Although libre is a cmake-based project, our expression for this
library does not currently use cmake for the configurePhase.  This
commit causes it to do so.

This is necessary to get downstream libre and baresip to cross-compile.
---
 pkgs/development/libraries/libre/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 7ed03f0af117..bc33f5d2e045 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, zlib, openssl }:
+{ lib, stdenv, fetchFromGitHub, zlib, openssl
+, cmake }:
+
 stdenv.mkDerivation rec {
   version = "2.9.0";
   pname = "libre";
@@ -9,6 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-YNAfHmohMqGGF8N/VdndJJ32PF/GMBoNtjo/t2lt6HA=";
   };
   buildInputs = [ zlib openssl ];
+  nativeBuildInputs = [ cmake ];
   makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
     ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
     ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"

From 67f93ae299730480bd4a7bfd77a1b10322b682c6 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sun, 26 Feb 2023 14:59:04 -0800
Subject: [PATCH 2/2] librem: use cmake for configurePhase

Although librem is a cmake-based project, our expression for this
library does not currently use cmake for the configurePhase.  This
commit causes it to do so.

This is necessary to get downstream libre and baresip to cross-compile.
---
 pkgs/development/libraries/librem/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index f343c4383c4a..3d393997a32e 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre }:
+{ lib, stdenv, fetchFromGitHub, zlib, openssl, libre
+, cmake }:
+
 stdenv.mkDerivation rec {
   version = "2.10.0";
   pname = "librem";
@@ -8,10 +10,13 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     sha256 = "sha256-wyzpx0WjQLA8UKx4S6QOETMehf51Af5napZsxMXttmM=";
   };
+  nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib openssl libre ];
+  cmakeFlags = [
+    "-DRE_INCLUDE_DIR=${libre}/include/re"
+  ];
   makeFlags = [
     "LIBRE_MK=${libre}/share/re/re.mk"
-    "LIBRE_INC=${libre}/include/re"
     "PREFIX=$(out)"
   ]
   ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}"