uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,55 @@
{ lib
, stdenv
, fetchFromGitHub
, ensureNewerSourcesForZipFilesHook
, pkg-config
, scons
, glibmm
, libpulseaudio
, libao
, speechd
}:
stdenv.mkDerivation rec {
pname = "rhvoice";
version = "1.8.0";
src = fetchFromGitHub {
owner = "RHVoice";
repo = "RHVoice";
rev = version;
fetchSubmodules = true;
hash = "sha256-G5886rjBaAp0AXcr07O0q7K1OXTayfIbd4zniKwDiLw=";
};
patches = [
# SConstruct patch
# Scons creates an independent environment that assumes standard POSIX paths.
# The patch is needed to push the nix environment.
# - PATH
# - PKG_CONFIG_PATH, to find available (sound) libraries
# - RPATH, to link to the newly built libraries
./honor_nix_environment.patch
];
nativeBuildInputs = [
ensureNewerSourcesForZipFilesHook
pkg-config
scons
];
buildInputs = [
glibmm
libpulseaudio
libao
speechd
];
meta = {
description = "A free and open source speech synthesizer for Russian language and others";
homepage = "https://github.com/Olga-Yakovleva/RHVoice/wiki";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ berce ];
platforms = with lib.platforms; all;
};
}

View file

@ -0,0 +1,31 @@
diff --git a/SConstruct b/SConstruct
index 3ad4d9a..fb02365 100644
--- a/SConstruct
+++ b/SConstruct
@@ -94,11 +94,8 @@ def CheckWiX(context):
return result
def get_spd_module_dir():
- 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):
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)
- if env["dev"]:
- env["prefix"]=os.path.abspath("local")
- env["RPATH"]=env.Dir("$libdir").abspath
+ env.PrependENVPath("PATH", os.environ["PATH"])
+ env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"]
+ env["RPATH"]=env.Dir("$libdir").abspath
env["package_version"]=get_version(env["release"])
env.Append(CPPDEFINES=("PACKAGE",env.subst(r'\"$package_name\"')))
if env["PLATFORM"]=="win32":