summaryrefslogtreecommitdiffstats
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/aubio/default.nix1
-rw-r--r--pkgs/development/libraries/ldb/default.nix4
-rw-r--r--pkgs/development/libraries/talloc/default.nix4
-rw-r--r--pkgs/development/libraries/tdb/default.nix4
-rw-r--r--pkgs/development/libraries/tevent/default.nix4
5 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 89f81e26de40..6702eb91c9b1 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ];
strictDeps = true;
- dontAddWafCrossFlags = true;
wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests";
postPatch = ''
diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index cdcf21edd799..3a1a8a8ebf1d 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -12,6 +12,7 @@
, docbook_xml_dtd_42
, cmocka
, wafHook
+, buildPackages
, libxcrypt
, testers
}:
@@ -62,6 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
"--without-ldb-lmdb"
+ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "--cross-compile"
+ "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
];
# python-config from build Python gives incorrect values when cross-compiling.
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 73cb8a65a162..793fc1ccf5cb 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -9,6 +9,7 @@
, docbook_xml_dtd_42
, fixDarwinDylibNames
, wafHook
+, buildPackages
}:
stdenv.mkDerivation rec {
@@ -50,6 +51,9 @@ stdenv.mkDerivation rec {
"--enable-talloc-compat1"
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
+ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "--cross-compile"
+ "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
];
# python-config from build Python gives incorrect values when cross-compiling.
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index 1a289f7c2d61..f8b3d4df4b70 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -2,6 +2,7 @@
, fetchurl
, pkg-config
, wafHook
+, buildPackages
, python3
, readline
, libxslt
@@ -46,6 +47,9 @@ stdenv.mkDerivation rec {
wafConfigureFlags = [
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
+ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "--cross-compile"
+ "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
];
postFixup = if stdenv.isDarwin
diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index 18e4522de9ea..d4a7d9c4342d 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -10,6 +10,7 @@
, docbook_xml_dtd_42
, which
, wafHook
+, buildPackages
, libxcrypt
}:
@@ -52,6 +53,9 @@ stdenv.mkDerivation rec {
wafConfigureFlags = [
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
+ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "--cross-compile"
+ "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
];
# python-config from build Python gives incorrect values when cross-compiling.