From 33966f99b37b746571260a018a40bd8733a3520f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 28 Jan 2023 08:25:39 +0000 Subject: [PATCH] rhvoice: fix NIX_* environment propagations to scons scons build system does not work by default in nixpkgs envoironment as it filters system environment and throws away NIX_* flags: https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html Fix build system to always propagate os.environment. --- .../audio/rhvoice/honor_nix_environment.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch index fed5a2ea5e1dabc..0b2cab3975e58fb 100644 --- a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch +++ b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch @@ -1,5 +1,3 @@ -diff --git a/SConstruct b/SConstruct -index 3ad4d9a..fb02365 100644 --- a/SConstruct +++ b/SConstruct @@ -94,11 +94,8 @@ def CheckWiX(context): @@ -16,13 +14,15 @@ index 3ad4d9a..fb02365 100644 def validate_spd_version(key,val,env): m=re.match(r"^\d+\.\d+",val) -@@ -208,9 +205,9 @@ def create_base_env(user_vars): +@@ -207,10 +204,10 @@ def create_base_env(user_vars): + env_args["LIBS"]=[] env_args["package_name"]="RHVoice" env_args["CPPDEFINES"]=[("RHVOICE","1")] - env=Environment(**env_args) +- env=Environment(**env_args) - if env["dev"]: - env["prefix"]=os.path.abspath("local") - env["RPATH"]=env.Dir("$libdir").abspath ++ env=Environment(ENV = os.environ, **env_args) + env.PrependENVPath("PATH", os.environ["PATH"]) + env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"] + env["RPATH"]=env.Dir("$libdir").abspath