Merge pull request #151811 from Mindavi/lv2/cross

lv2 + sratom + lilv: support cross-compilation
This commit is contained in:
Sandro 2022-04-13 12:32:10 +02:00 committed by GitHub
commit bbfc6cf286
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 2 deletions

View File

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config python3 wafHook ];
buildInputs = [ serd sord sratom ];
propagatedBuildInputs = [ lv2 ];
dontAddWafCrossFlags = true;
passthru.tests = {
inherit pipewire;

View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
wafHook
python3
];
buildInputs = [
@ -35,6 +36,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [
"--lv2dir=${placeholder "out"}/lib/lv2"
];
dontAddWafCrossFlags = true;
passthru.tests = {
inherit pipewire;

View File

@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config wafHook python3 ];
buildInputs = [ lv2 serd sord ];
dontAddWafCrossFlags = true;
meta = with lib; {
homepage = "http://drobilla.net/software/sratom";

View File

@ -10,6 +10,10 @@ wafConfigurePhase() {
wafConfigureFlags="${prefixKey:---prefix=}$prefix $wafConfigureFlags"
fi
if [ -n "${PKG_CONFIG}" ]; then
export PKGCONFIG="${PKG_CONFIG}"
fi
local flagsArray=(
"${flagsArray[@]}"
$wafConfigureFlags "${wafConfigureFlagsArray[@]}"

View File

@ -48,8 +48,6 @@ stdenv.mkDerivation rec {
--replace /bin/bash ${bash}/bin/bash
'';
PKGCONFIG = "${stdenv.cc.targetPrefix}pkg-config";
dontAddWafCrossFlags = "true";
wafConfigureFlags = [
"--classic"