diff options
| author | Robert Schütz <nix@dotlambda.de> | 2022-05-05 01:45:11 +0000 |
|---|---|---|
| committer | Robert Schütz <github@dotlambda.de> | 2022-05-14 19:03:52 -0700 |
| commit | e96d684b8f97176207ef8a327f5f62a0ff8e303e (patch) | |
| tree | 587099de154e752c307e8f65b0b0263eeaf59d3f /pkgs/applications/audio/rhvoice | |
| parent | 62753a4f396a2b88ac86377e55306f823859462c (diff) | |
| download | nixpkgs-e96d684b8f97176207ef8a327f5f62a0ff8e303e.tar nixpkgs-e96d684b8f97176207ef8a327f5f62a0ff8e303e.tar.gz nixpkgs-e96d684b8f97176207ef8a327f5f62a0ff8e303e.tar.bz2 nixpkgs-e96d684b8f97176207ef8a327f5f62a0ff8e303e.tar.lz nixpkgs-e96d684b8f97176207ef8a327f5f62a0ff8e303e.tar.xz nixpkgs-e96d684b8f97176207ef8a327f5f62a0ff8e303e.tar.zst nixpkgs-e96d684b8f97176207ef8a327f5f62a0ff8e303e.zip | |
rhvoice: 1.6.0 -> 1.8.0
https://github.com/RHVoice/RHVoice/releases/tag/1.8.0
Diffstat (limited to 'pkgs/applications/audio/rhvoice')
| -rw-r--r-- | pkgs/applications/audio/rhvoice/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/rhvoice/honor_nix_environment.patch | 19 |
2 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index f72b8404104..af2ce6ae25b 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "rhvoice"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "RHVoice"; repo = "RHVoice"; rev = version; fetchSubmodules = true; - hash = "sha256-5iq+St/fqGMeJu2XaiCmgzBpxqE9IQLnKlfZErd1fPs="; + hash = "sha256-G5886rjBaAp0AXcr07O0q7K1OXTayfIbd4zniKwDiLw="; }; patches = [ diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch index 1c0c9d3ee45..fed5a2ea5e1 100644 --- a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch +++ b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch @@ -1,17 +1,22 @@ diff --git a/SConstruct b/SConstruct -index b29168f..d507b95 100644 +index 3ad4d9a..fb02365 100644 --- a/SConstruct +++ b/SConstruct -@@ -93,6 +93,8 @@ def CheckWiX(context): +@@ -94,11 +94,8 @@ def CheckWiX(context): + return result def get_spd_module_dir(): - env = Environment() -+ env.PrependENVPath("PATH", os.environ["PATH"]) -+ env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"] - return env.ParseConfig("pkg-config speech-dispatcher --variable=modulebindir", passthru) +- env = Environment() +- try: +- return env.ParseConfig("pkg-config speech-dispatcher --variable=modulebindir", passthru) +- except: +- return False ++ # cannot write to ${speechd}/libexec/speech-dispatcher-modules ++ return os.path.join(os.environ["out"], "libexec/speech-dispatcher-modules") def validate_spd_version(key,val,env): -@@ -202,9 +204,9 @@ def create_base_env(user_vars): + m=re.match(r"^\d+\.\d+",val) +@@ -208,9 +205,9 @@ def create_base_env(user_vars): env_args["package_name"]="RHVoice" env_args["CPPDEFINES"]=[("RHVOICE","1")] env=Environment(**env_args) |