summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2023-02-26 14:59:04 -0800
committerAdam Joseph <adam@westernsemico.com>2023-02-26 14:59:31 -0800
commit67f93ae299730480bd4a7bfd77a1b10322b682c6 (patch)
tree3a33708a38c3ffa15fb219fa10c2b31917de2f8d
parent5a65a419627fa1746fac2d8b1a7219a47908e781 (diff)
downloadnixpkgs-67f93ae299730480bd4a7bfd77a1b10322b682c6.tar
nixpkgs-67f93ae299730480bd4a7bfd77a1b10322b682c6.tar.gz
nixpkgs-67f93ae299730480bd4a7bfd77a1b10322b682c6.tar.bz2
nixpkgs-67f93ae299730480bd4a7bfd77a1b10322b682c6.tar.lz
nixpkgs-67f93ae299730480bd4a7bfd77a1b10322b682c6.tar.xz
nixpkgs-67f93ae299730480bd4a7bfd77a1b10322b682c6.tar.zst
nixpkgs-67f93ae299730480bd4a7bfd77a1b10322b682c6.zip
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.
-rw-r--r--pkgs/development/libraries/librem/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index f343c4383c4..3d393997a32 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}"