From a2f91d1831e0da7c9e673c960d136fbe1e6297a0 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sun, 10 Apr 2022 17:02:40 +0200 Subject: [PATCH 1/5] wafHook: export PKGCONFIG if needed This is useful for cross-compilation, where nixpkgs sets PKG_CONFIG. waf decided to use PKGCONFIG instead, so we'll set it when necessary. --- pkgs/development/tools/build-managers/wafHook/setup-hook.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh index 6cea8fcc2ea8..e2f6714a32d4 100644 --- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh @@ -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[@]}" From a13f4f6c1cfaa02531abf37f18029ebe0a136e96 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sun, 10 Apr 2022 17:04:25 +0200 Subject: [PATCH 2/5] jackaudio: remove unneeded PKGCONFIG variable Not needed anymore after setting this correctly in the wafHook. --- pkgs/misc/jackaudio/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 92574231549e..2f7ffeb89f32 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -48,8 +48,6 @@ stdenv.mkDerivation rec { --replace /bin/bash ${bash}/bin/bash ''; - PKGCONFIG = "${stdenv.cc.targetPrefix}pkg-config"; - dontAddWafCrossFlags = "true"; wafConfigureFlags = [ "--classic" From 65940487937d053d303b2127d755f7c071b4b622 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sun, 10 Apr 2022 17:09:34 +0200 Subject: [PATCH 3/5] lv2: support cross-compilation The waf cross flags seem to not be useful for most packages, to me. I'll just set the flag for now, but maybe turning it around may be more useful to do somewhere in the future. --- pkgs/development/libraries/audio/lv2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index d0ef2e65c598..6371a52b4dff 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -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; From 70e88b8cb2973db94980783f3c95cc713568a1ba Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 22 Dec 2021 20:19:16 +0100 Subject: [PATCH 4/5] sratom: support cross-compilation --- pkgs/development/libraries/audio/sratom/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 1a40d249fd5e..67a66dbfe5a2 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -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"; From 76015b8597fb1b52b49e37ca600a0a8f51b6aa20 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 22 Dec 2021 20:20:23 +0100 Subject: [PATCH 5/5] lilv: support cross-compilation --- pkgs/development/libraries/audio/lilv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index a29fda0ec2b2..14b0d4c5e46f 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; + dontAddWafCrossFlags = true; passthru.tests = { inherit pipewire;