Merge pull request #151811 from Mindavi/lv2/cross
lv2 + sratom + lilv: support cross-compilation
This commit is contained in:
commit
bbfc6cf286
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config python3 wafHook ];
|
||||
buildInputs = [ serd sord sratom ];
|
||||
propagatedBuildInputs = [ lv2 ];
|
||||
dontAddWafCrossFlags = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit pipewire;
|
||||
|
@ -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;
|
||||
|
@ -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";
|
||||
|
@ -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[@]}"
|
||||
|
@ -48,8 +48,6 @@ stdenv.mkDerivation rec {
|
||||
--replace /bin/bash ${bash}/bin/bash
|
||||
'';
|
||||
|
||||
PKGCONFIG = "${stdenv.cc.targetPrefix}pkg-config";
|
||||
|
||||
dontAddWafCrossFlags = "true";
|
||||
wafConfigureFlags = [
|
||||
"--classic"
|
||||
|
Loading…
Reference in New Issue
Block a user