From 9f75fd7e6fde4fecb91398eed3aa0690f3f87c86 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Mon, 15 May 2023 09:29:44 -0400 Subject: [PATCH] csound: fix cross with gettext hack We need to ignore gettext in CMAKE_PREFIX_PATH on cross to prevent `find_program` from picking up the wrong gettext. See the `webkitgtk` and `fish` derivations for similar hacks (though this really should eventually be fixed at a lower level). The wrong gettext in this case is getting pulled in via: csound(host) -> fluidsynth(host) -> glib(host) -> gettext(host) --- pkgs/applications/audio/csound/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index ac8303955f9e..ccaacf189fae 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -31,7 +31,9 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp - ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib"; + ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib" + # Ignore gettext in CMAKE_PREFIX_PATH on cross to prevent find_program picking up the wrong gettext + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin"; nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ]