Skip to content

Commit

Permalink
rhvoice: fix NIX_* environment propagations to scons
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
trofi committed Jan 28, 2023
1 parent 277d34f commit 33966f9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkgs/applications/audio/rhvoice/honor_nix_environment.patch
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -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
Expand Down

0 comments on commit 33966f9

Please sign in to comment.