diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2023-03-06 20:25:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 20:25:56 +0000 |
| commit | c2354a687879ae0b63f8a5ce81ea2208b2250494 (patch) | |
| tree | aab23012dd3e9c4cbb48300e0f10ffced6a62cae | |
| parent | 4f135a07385da8157460cf7659e1d0bce708249a (diff) | |
| parent | 67f93ae299730480bd4a7bfd77a1b10322b682c6 (diff) | |
Merge pull request #218520 from amjoseph-nixpkgs/pr/librem/cross
librem: use cmake for configurePhase
| -rw-r--r-- | pkgs/development/libraries/libre/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/librem/default.nix | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 9ddebe5b6b0b..bfcdb2d5287c 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}" diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 14641ad66722..2e9a2f1fa31b 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}" |