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,24 @@
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 535bd69..b017161 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -436,7 +436,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
defaults.external_lib_extension = "dylib"
defaults.arch = "macosx-"..target_cpu
defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
- local version = util.popen_read("sw_vers -productVersion")
+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@"
if not (version:match("^%d+%.%d+%.%d+$") or version:match("^%d+%.%d+$")) then
version = "10.3"
end
@@ -448,8 +448,8 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
else
defaults.gcc_rpath = false
end
- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc"
- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc"
+ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." clang"
+ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." clang"
defaults.web_browser = "open"
end

View file

@ -0,0 +1,81 @@
{lib, stdenv, fetchFromGitHub
, curl, makeWrapper, which, unzip
, lua
# for 'luarocks pack'
, zip
# some packages need to be compiled with cmake
, cmake
, installShellFiles
}:
stdenv.mkDerivation rec {
pname = "luarocks";
version = "3.8.0";
src = fetchFromGitHub {
owner = "luarocks";
repo = "luarocks";
rev = "v${version}";
sha256 = "sha256-tPSAtveOodF2w54d82hEyaTj91imtySJUTsk/gje2dQ=";
};
patches = [ ./darwin-3.7.0.patch ];
postPatch = lib.optionalString stdenv.targetPlatform.isDarwin ''
substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}'
'';
preConfigure = ''
lua -e "" || {
luajit -e "" && {
export LUA_SUFFIX=jit
configureFlags="$configureFlags --lua-suffix=$LUA_SUFFIX"
}
}
lua_inc="$(echo "${lua}/include"/*/)"
if test -n "$lua_inc"; then
configureFlags="$configureFlags --with-lua-include=$lua_inc"
fi
'';
nativeBuildInputs = [ makeWrapper installShellFiles ];
buildInputs = [ lua curl which ];
postInstall = ''
sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/*
for i in "$out"/bin/*; do
test -L "$i" || {
wrapProgram "$i" \
--suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \
--suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \
--suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \
--suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua"
}
done
installShellCompletion --cmd luarocks --bash <($out/bin/luarocks completion bash)
installShellCompletion --cmd luarocks --zsh <($out/bin/luarocks completion zsh)
'';
propagatedBuildInputs = [ zip unzip cmake ];
# unpack hook for src.rock and rockspec files
setupHook = ./setup-hook.sh;
# cmake is just to compile packages with "cmake" buildType, not luarocks itself
dontUseCmakeConfigure = true;
shellHook = ''
export PATH="src/bin:''${PATH:-}"
export LUA_PATH="src/?.lua;''${LUA_PATH:-}"
'';
meta = with lib; {
description = "A package manager for Lua";
license = licenses.mit ;
maintainers = with maintainers; [raskin teto];
platforms = platforms.linux ++ platforms.darwin;
downloadPage = "http://luarocks.org/releases/";
};
}

View file

@ -0,0 +1,14 @@
{ luarocks, fetchFromGitHub }:
luarocks.overrideAttrs(old: {
pname = "luarocks-nix";
version = "2021-01-22";
src = fetchFromGitHub {
owner = "nix-community";
repo = "luarocks-nix";
rev = "6aa1d59e88eaef72d699477c3e7aa98b274ca405";
sha256 = "sha256-nQLl01RFYZYhpShz0gHxnhwFPvTgALpAbjFPIuTD2D0=";
};
patches = [];
meta.mainProgram = "luarocks";
})

View file

@ -0,0 +1,16 @@
unpackCmdHooks+=(_trySourceRock)
unpackCmdHooks+=(_tryRockSpec)
_tryRockSpec() {
if ! [[ "$curSrc" =~ \.rockspec$ ]]; then return 1; fi
}
_trySourceRock() {
if ! [[ "$curSrc" =~ \.src.rock$ ]]; then return 1; fi
# luarocks expects a clean <name>.rock.spec name to be the package name
# so we have to strip the hash
renamed="$(stripHash $curSrc)"
cp "$curSrc" "$renamed"
luarocks unpack --force "$renamed"
}