Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
esp-idf-nix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mr. Snow Ball / projects
esp-idf-nix
Commits
4948ca78
Commit
4948ca78
authored
4 years ago
by
test_nonet
Browse files
Options
Downloads
Patches
Plain Diff
some improvements -> crosstool can build the first few things
parent
fbef27ef
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
esp32-tools.nix
+11
-8
11 additions, 8 deletions
esp32-tools.nix
with
11 additions
and
8 deletions
esp32-tools.nix
+
11
−
8
View file @
4948ca78
{
stdenv
,
fetchurl
,
fetchgit
,
fetchFromGitHub
,
espressif-crosstool-ng
,
gcc
,
binutils
,
which
,
lib
,
gnum4
,
perl
}:
{
lib
,
stdenv
,
fetchurl
,
fetchgit
,
fetchFromGitHub
,
espressif-crosstool-ng
,
autoconf
,
automake
,
bison
,
flex
,
unzip
,
help2man
,
libtool
,
which
,
texinfo
,
file
,
wget
,
gnum4
,
perl
}:
let
srcs
=
import
./sources.nix
{
inherit
fetchFromGitHub
;
};
srcs2
=
import
./sources2.nix
{
inherit
fetchurl
fetchgit
fetchFromGitHub
;
};
...
...
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
additionalSources
=
lib
.
strings
.
concatStringsSep
"
\n
"
(
lib
.
attrsets
.
mapAttrsToList
(
name
:
drv
:
if
drv
?
outPath
then
"
${
name
}
${
drv
.
outPath
}
"
else
""
)
srcs2
);
nativeBuildInputs
=
[
espressif-crosstool-ng
gcc
binutils
which
gnum4
perl
];
nativeBuildInputs
=
[
espressif-crosstool-ng
autoconf
automake
bison
flex
unzip
help2man
libtool
which
texinfo
file
wget
gnum4
perl
];
dontConfigure
=
true
;
dontInstall
=
true
;
...
...
@@ -22,16 +22,19 @@ in stdenv.mkDerivation {
echo "CT_FORBID_DOWNLOAD=y" >>.config
mkdir tarballs
while read name path ; do
echo ln -s $path tarballs/$name
ln -s $path tarballs/$name
if [ -d tarballs/$name/ ] ; then
printf "%-20s -> %s" $name $path
if [ -d $path ] ; then
# ugly but works...
tar -C tarballs -cjf tarballs/$name.tar.bz2 $name
cp -aHT $path tarballs/$name
chmod -R u+w tarballs/$name
tar -C tarballs -cjf tarballs/$name.tar.bz2 $name/
else
ln -s $path tarballs/$name
fi
done <<<"$additionalSources"
echo "$additionalSources"
CT_USE_SOURCES_FROM_NIXOS=y \
ct-ng build
ct-ng build \
|| ( tail -n 100 build.log ; exit 1 )
''
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment